hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

f2fs: use MAX_BIO_BLOCKS(sbi) 

This patch cleans up a simple macro.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Jaegeuk Kim 2014-09-22 16:21:07 -07:00
parent c52e1b10b1
commit 90a893c749
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/f2fs/checkpoint.c
View File

@ -83,8 +83,7 @@ struct page *get_meta_page_ra(struct f2fs_sb_info *sbi, pgoff_t index)
f2fs_put_page(page, 0); f2fs_put_page(page, 0);
if (readahead) if (readahead)
ra_meta_pages(sbi, index, ra_meta_pages(sbi, index, MAX_BIO_BLOCKS(sbi), META_POR);
MAX_BIO_BLOCKS(max_hw_blocks(sbi)), META_POR);
return get_meta_page(sbi, index); return get_meta_page(sbi, index);
} }

2
fs/f2fs/data.c
View File

@ -193,7 +193,7 @@ void f2fs_submit_page_mbio(struct f2fs_sb_info *sbi, struct page *page,
__submit_merged_bio(io); __submit_merged_bio(io);
alloc_new: alloc_new:
if (io->bio == NULL) { 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->bio = __bio_alloc(sbi, blk_addr, bio_blocks, is_read);
io->fio = *fio; io->fio = *fio;

2
fs/f2fs/node.c
View File

@ -1697,7 +1697,7 @@ int restore_node_summary(struct f2fs_sb_info *sbi,
struct f2fs_summary *sum_entry; struct f2fs_summary *sum_entry;
struct inode *inode = sbi->sb->s_bdev->bd_inode; struct inode *inode = sbi->sb->s_bdev->bd_inode;
block_t addr; 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]; struct page *pages[bio_blocks];
int i, idx, last_offset, nrpages, err = 0; int i, idx, last_offset, nrpages, err = 0;

2
fs/f2fs/segment.c
View File

@ -1757,7 +1757,7 @@ static void build_sit_entries(struct f2fs_sb_info *sbi)
int sit_blk_cnt = SIT_BLK_CNT(sbi); int sit_blk_cnt = SIT_BLK_CNT(sbi);
unsigned int i, start, end; unsigned int i, start, end;
unsigned int readed, start_blk = 0; unsigned int readed, start_blk = 0;
int nrpages = MAX_BIO_BLOCKS(max_hw_blocks(sbi)); int nrpages = MAX_BIO_BLOCKS(sbi);
do { do {
readed = ra_meta_pages(sbi, start_blk, nrpages, META_SIT); readed = ra_meta_pages(sbi, start_blk, nrpages, META_SIT);

8
fs/f2fs/segment.h
View File

@ -93,8 +93,8 @@
(((sector_t)blk_addr) << (sbi)->log_sectors_per_block) (((sector_t)blk_addr) << (sbi)->log_sectors_per_block)
#define SECTOR_TO_BLOCK(sbi, sectors) \ #define SECTOR_TO_BLOCK(sbi, sectors) \
(sectors >> (sbi)->log_sectors_per_block) (sectors >> (sbi)->log_sectors_per_block)
#define MAX_BIO_BLOCKS(max_hw_blocks) \ #define MAX_BIO_BLOCKS(sbi) \
(min((int)max_hw_blocks, BIO_MAX_PAGES)) ((int)min((int)max_hw_blocks(sbi), BIO_MAX_PAGES))
/* /*
* indicate a block allocation direction: RIGHT and LEFT. * 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) else if (type == NODE)
return 3 * sbi->blocks_per_seg; return 3 * sbi->blocks_per_seg;
else if (type == META) else if (type == META)
return MAX_BIO_BLOCKS(max_hw_blocks(sbi)); return MAX_BIO_BLOCKS(sbi);
else else
return 0; return 0;
} }
@ -751,7 +751,7 @@ static inline long nr_pages_to_write(struct f2fs_sb_info *sbi, int type,
else if (type == NODE) else if (type == NODE)
desired = 3 * max_hw_blocks(sbi); desired = 3 * max_hw_blocks(sbi);
else else
desired = MAX_BIO_BLOCKS(max_hw_blocks(sbi)); desired = MAX_BIO_BLOCKS(sbi);
wbc->nr_to_write = desired; wbc->nr_to_write = desired;
return desired - nr_to_write; return desired - nr_to_write;