f2fs: use MAX_BIO_BLOCKS(sbi)

This patch cleans up a simple macro.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index a1786d680906f049dc162e68c1e94d02d48c0234..b4a813345de283be6ca30d086ca56f0361a07df1 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -83,8 +83,7 @@ struct page *get_meta_page_ra(struct f2fs_sb_info *sbi, pgoff_t index)
        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 fdc3dbe677a13121483917c2dc7b6620a025cdc0..7749f305b102861e1854f598c26c420d7d5aea0f 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -193,7 +193,7 @@ void f2fs_submit_page_mbio(struct f2fs_sb_info *sbi, struct page *page,
                __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 7a2d9c980c96f91120105362e2ddb5a78077e9c9..21ed91b3cb54cdd7bbe3cba1d563233fe66dde19 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1697,7 +1697,7 @@ int restore_node_summary(struct f2fs_sb_info *sbi,
        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 c6f627b492cd786ebb997bee4ec348ad54934c98..4ea53aab786d984da2a9fd4e8bdd2ea283394c4c 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1757,7 +1757,7 @@ static void build_sit_entries(struct f2fs_sb_info *sbi)
        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 c6f37f2fe50ef1be278bc80ec75ae9e18cfd1823..848ac519958fa97d9d0440b59d305cdff8da2d4b 100644 (file)
--- 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 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
        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 @@ static inline long nr_pages_to_write(struct f2fs_sb_info *sbi, int type,
        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;