From: Chi Zhiling Date: Tue, 12 Aug 2025 07:22:25 +0000 (+0800) Subject: mpage: convert do_mpage_readpage() to return int type X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=aaffdc49aebba00880562268afbcc58f2ac4cff6;p=users%2Fjedix%2Flinux-maple.git mpage: convert do_mpage_readpage() to return int type The return value of do_mpage_readpage() is arg->bio, which is already set in the arg structure. Returning it again is redundant. This patch changes the return type to int and always returns 0 since the caller does not care about the return value. Link: https://lkml.kernel.org/r/20250812072225.181798-3-chizhiling@163.com Signed-off-by: Chi Zhiling Cc: Al Viro Cc: Christian Brauner Cc: Jan Kara Cc: Matthew Wilcox (Oracle) Cc: Namjae Jeon Cc: Sungjong Seo Cc: Yuezhang Mo Signed-off-by: Andrew Morton --- diff --git a/fs/mpage.c b/fs/mpage.c index b6510b8dfa2b..07b4317cceda 100644 --- a/fs/mpage.c +++ b/fs/mpage.c @@ -148,7 +148,7 @@ struct mpage_readpage_args { * represent the validity of its disk mapping and to decide when to do the next * get_block() call. */ -static struct bio *do_mpage_readpage(struct mpage_readpage_args *args) +static int do_mpage_readpage(struct mpage_readpage_args *args) { struct folio *folio = args->folio; struct inode *inode = folio->mapping->host; @@ -305,7 +305,7 @@ alloc_new: else args->last_block_in_bio = first_block + blocks_per_folio - 1; out: - return args->bio; + return 0; confused: if (args->bio) @@ -368,7 +368,7 @@ void mpage_readahead(struct readahead_control *rac, get_block_t get_block) prefetchw(&folio->flags); args.folio = folio; args.nr_pages = readahead_count(rac); - args.bio = do_mpage_readpage(&args); + do_mpage_readpage(&args); if (!folio_test_locked(folio) && !folio_test_uptodate(folio)) break; @@ -389,7 +389,7 @@ int mpage_read_folio(struct folio *folio, get_block_t get_block) .get_block = get_block, }; - args.bio = do_mpage_readpage(&args); + do_mpage_readpage(&args); if (args.bio) mpage_bio_submit_read(args.bio); return 0;