f2fs: use MAX_BIO_BLOCKS(sbi) This patch cleans up a simple macro. Signed-off-by: Jaegeuk Kim <[email protected]>
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index a1786d6..b4a8133 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c
@@ -83,8 +83,7 @@ f2fs_put_page(page, 0); if (readahead) - ra_meta_pages(sbi, index, - MAX_BIO_BLOCKS(max_hw_blocks(sbi)), META_POR); + ra_meta_pages(sbi, index, MAX_BIO_BLOCKS(sbi), META_POR); return get_meta_page(sbi, index); }
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index fdc3dbe..7749f30 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c
@@ -193,7 +193,7 @@ __submit_merged_bio(io); alloc_new: if (io->bio == NULL) { - int bio_blocks = MAX_BIO_BLOCKS(max_hw_blocks(sbi)); + int bio_blocks = MAX_BIO_BLOCKS(sbi); io->bio = __bio_alloc(sbi, blk_addr, bio_blocks, is_read); io->fio = *fio;
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 7a2d9c9..21ed91b 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c
@@ -1697,7 +1697,7 @@ struct f2fs_summary *sum_entry; struct inode *inode = sbi->sb->s_bdev->bd_inode; block_t addr; - int bio_blocks = MAX_BIO_BLOCKS(max_hw_blocks(sbi)); + int bio_blocks = MAX_BIO_BLOCKS(sbi); struct page *pages[bio_blocks]; int i, idx, last_offset, nrpages, err = 0;
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index c6f627b49..4ea53aab 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c
@@ -1757,7 +1757,7 @@ int sit_blk_cnt = SIT_BLK_CNT(sbi); unsigned int i, start, end; unsigned int readed, start_blk = 0; - int nrpages = MAX_BIO_BLOCKS(max_hw_blocks(sbi)); + int nrpages = MAX_BIO_BLOCKS(sbi); do { readed = ra_meta_pages(sbi, start_blk, nrpages, META_SIT);
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h index c6f37f2..848ac51 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h
@@ -93,8 +93,8 @@ (((sector_t)blk_addr) << (sbi)->log_sectors_per_block) #define SECTOR_TO_BLOCK(sbi, sectors) \ (sectors >> (sbi)->log_sectors_per_block) -#define MAX_BIO_BLOCKS(max_hw_blocks) \ - (min((int)max_hw_blocks, BIO_MAX_PAGES)) +#define MAX_BIO_BLOCKS(sbi) \ + ((int)min((int)max_hw_blocks(sbi), BIO_MAX_PAGES)) /* * indicate a block allocation direction: RIGHT and LEFT. @@ -728,7 +728,7 @@ else if (type == NODE) return 3 * sbi->blocks_per_seg; else if (type == META) - return MAX_BIO_BLOCKS(max_hw_blocks(sbi)); + return MAX_BIO_BLOCKS(sbi); else return 0; } @@ -751,7 +751,7 @@ else if (type == NODE) desired = 3 * max_hw_blocks(sbi); else - desired = MAX_BIO_BLOCKS(max_hw_blocks(sbi)); + desired = MAX_BIO_BLOCKS(sbi); wbc->nr_to_write = desired; return desired - nr_to_write;