diff options
author | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-09-22 19:21:07 -0400 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-09-23 14:10:18 -0400 |
commit | 90a893c749f4582f21e97639f4e85e7f2362c2f0 (patch) | |
tree | 01a3e6a5b21361c7fc04c601d63f84a7b62d0020 /fs/f2fs/segment.h | |
parent | c52e1b10b175bef84f1681946b4a438cc4c84147 (diff) |
f2fs: use MAX_BIO_BLOCKS(sbi)
This patch cleans up a simple macro.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/segment.h')
-rw-r--r-- | fs/f2fs/segment.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h index c6f37f2fe50e..848ac519958f 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h | |||
@@ -93,8 +93,8 @@ | |||
93 | (((sector_t)blk_addr) << (sbi)->log_sectors_per_block) | 93 | (((sector_t)blk_addr) << (sbi)->log_sectors_per_block) |
94 | #define SECTOR_TO_BLOCK(sbi, sectors) \ | 94 | #define SECTOR_TO_BLOCK(sbi, sectors) \ |
95 | (sectors >> (sbi)->log_sectors_per_block) | 95 | (sectors >> (sbi)->log_sectors_per_block) |
96 | #define MAX_BIO_BLOCKS(max_hw_blocks) \ | 96 | #define MAX_BIO_BLOCKS(sbi) \ |
97 | (min((int)max_hw_blocks, BIO_MAX_PAGES)) | 97 | ((int)min((int)max_hw_blocks(sbi), BIO_MAX_PAGES)) |
98 | 98 | ||
99 | /* | 99 | /* |
100 | * indicate a block allocation direction: RIGHT and LEFT. | 100 | * 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) | |||
728 | else if (type == NODE) | 728 | else if (type == NODE) |
729 | return 3 * sbi->blocks_per_seg; | 729 | return 3 * sbi->blocks_per_seg; |
730 | else if (type == META) | 730 | else if (type == META) |
731 | return MAX_BIO_BLOCKS(max_hw_blocks(sbi)); | 731 | return MAX_BIO_BLOCKS(sbi); |
732 | else | 732 | else |
733 | return 0; | 733 | return 0; |
734 | } | 734 | } |
@@ -751,7 +751,7 @@ static inline long nr_pages_to_write(struct f2fs_sb_info *sbi, int type, | |||
751 | else if (type == NODE) | 751 | else if (type == NODE) |
752 | desired = 3 * max_hw_blocks(sbi); | 752 | desired = 3 * max_hw_blocks(sbi); |
753 | else | 753 | else |
754 | desired = MAX_BIO_BLOCKS(max_hw_blocks(sbi)); | 754 | desired = MAX_BIO_BLOCKS(sbi); |
755 | 755 | ||
756 | wbc->nr_to_write = desired; | 756 | wbc->nr_to_write = desired; |
757 | return desired - nr_to_write; | 757 | return desired - nr_to_write; |