f2fs: clean up set REQ_RAHEAD given rac
Jaegeuk Kim
maintainerPATCH 1/1 f2fs: clean up set REQ_RAHEAD given rac
Let's set REQ_RAHEAD per rac by single source.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/compress.c | 2 +- fs/f2fs/data.c | 17 +++++++++++------ fs/f2fs/f2fs.h | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-)
fs/f2fs/compress.c +1 -1
@@ -1100,7 +1100,7 @@ static int prepare_compress_overwrite(struct compress_ctx *cc,struct bio *bio =NULL ; ret =f2fs_read_multi_pages (cc, &bio, cc->cluster_size, - &last_block_in_bio, false, true); + &last_block_in_bio,NULL , true);f2fs_put_rpages (cc);f2fs_destroy_compress_ctx (cc, true);if (ret)
fs/f2fs/data.c +11 -6
@@ -2067,12 +2067,17 @@ static inline loff_t f2fs_readpage_limit(struct inode *inode)return i_size_read (inode); } +static inline blk_opf_t f2fs_ra_op_flags (struct readahead_control *rac) +{ +return rac ?REQ_RAHEAD :0 ; +} +static int f2fs_read_single_page (struct inode *inode,struct folio *folio,unsigned nr_pages,struct f2fs_map_blocks *map,struct bio **bio_ret,sector_t *last_block_in_bio, -bool is_readahead) +struct readahead_control *rac) {struct bio *bio = *bio_ret;const unsigned blocksize =blks_to_bytes (inode,1 );
@@ -2148,7 +2153,7 @@ static int f2fs_read_single_page(struct inode *inode, struct folio *folio, }if (bio ==NULL ) { bio =f2fs_grab_read_bio (inode, block_nr, nr_pages, - is_readahead ?REQ_RAHEAD :0 , index, +f2fs_ra_op_flags (rac), index, false);if (IS_ERR (bio)) { ret =PTR_ERR (bio);
@@ -2178,7 +2183,7 @@ static int f2fs_read_single_page(struct inode *inode, struct folio *folio,#ifdef CONFIG_F2FS_FS_COMPRESSION int f2fs_read_multi_pages (struct compress_ctx *cc,struct bio **bio_ret,unsigned nr_pages,sector_t *last_block_in_bio, -bool is_readahead,bool for_write) +struct readahead_control *rac,bool for_write) {struct dnode_of_data dn;struct inode *inode = cc->inode;
@@ -2301,7 +2306,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,if (!bio) { bio =f2fs_grab_read_bio (inode, blkaddr, nr_pages, - is_readahead ?REQ_RAHEAD :0 , +f2fs_ra_op_flags (rac), page->index, for_write);if (IS_ERR (bio)) { ret =PTR_ERR (bio);
@@ -2399,7 +2404,7 @@ static int f2fs_mpage_readpages(struct inode *inode, ret =f2fs_read_multi_pages (&cc, &bio, max_nr_pages, &last_block_in_bio, - rac !=NULL , false); + rac, false);f2fs_destroy_compress_ctx (&cc, false);if (ret) goto set_error_page;
@@ -2449,7 +2454,7 @@ static int f2fs_mpage_readpages(struct inode *inode, ret =f2fs_read_multi_pages (&cc, &bio, max_nr_pages, &last_block_in_bio, - rac !=NULL , false); + rac, false);f2fs_destroy_compress_ctx (&cc, false); } }
fs/f2fs/f2fs.h +1 -1
@@ -4297,7 +4297,7 @@ void f2fs_update_read_extent_tree_range_compressed(struct inode *inode, unsigned int llen, unsigned int c_len);int f2fs_read_multi_pages (struct compress_ctx *cc,struct bio **bio_ret,unsigned nr_pages,sector_t *last_block_in_bio, -bool is_readahead,bool for_write); +struct readahead_control *rac,bool for_write);struct decompress_io_ctx *f2fs_alloc_dic (struct compress_ctx *cc);void f2fs_decompress_end_io (struct decompress_io_ctx *dic,bool failed,bool in_task);
Signature · 1 line
2.45.2.505.gda0bf45e8d-goog
Quoted 3 lines · Jaegeuk Kim
Let's set
REQ_RAHEADper rac by single source.Signed-off-by Jaegeuk Kim <[email protected]>
Reviewed-by Chao Yu <[email protected]>
Thanks,
This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This patch was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 8 lines · On Wed, 12 Jun 2024 19:38:31 +0000 you wrote:
Let's set
REQ_RAHEADper rac by single source.Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/compress.c | 2 +- fs/f2fs/data.c | 17 +++++++++++------ fs/f2fs/f2fs.h | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-)
Here is the summary with links:
- [f2fs-dev] f2fs: clean up set REQ_RAHEAD given rac
https://git.kernel.org/jaegeuk/f2fs/c/6aeb084fa0b1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html