Skip to content

Commit 39122e4

Browse files
Christoph HellwigJaegeuk Kim
authored andcommitted
f2fs: return bool from __f2fs_write_meta_folio
__f2fs_write_meta_folio can only return 0 or AOP_WRITEPAGE_ACTIVATE. As part of phasing out AOP_WRITEPAGE_ACTIVATE, switch to a bool return instead. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 43ba56a commit 39122e4

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

fs/f2fs/checkpoint.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ void f2fs_ra_meta_pages_cond(struct f2fs_sb_info *sbi, pgoff_t index,
340340
f2fs_ra_meta_pages(sbi, index, ra_blocks, META_POR, true);
341341
}
342342

343-
static int __f2fs_write_meta_folio(struct folio *folio,
343+
static bool __f2fs_write_meta_folio(struct folio *folio,
344344
struct writeback_control *wbc,
345345
enum iostat_type io_type)
346346
{
@@ -353,7 +353,7 @@ static int __f2fs_write_meta_folio(struct folio *folio,
353353
folio_clear_uptodate(folio);
354354
dec_page_count(sbi, F2FS_DIRTY_META);
355355
folio_unlock(folio);
356-
return 0;
356+
return true;
357357
}
358358
goto redirty_out;
359359
}
@@ -373,11 +373,11 @@ static int __f2fs_write_meta_folio(struct folio *folio,
373373
if (unlikely(f2fs_cp_error(sbi)))
374374
f2fs_submit_merged_write(sbi, META);
375375

376-
return 0;
376+
return true;
377377

378378
redirty_out:
379379
folio_redirty_for_writepage(wbc, folio);
380-
return AOP_WRITEPAGE_ACTIVATE;
380+
return false;
381381
}
382382

383383
static int f2fs_write_meta_pages(struct address_space *mapping,
@@ -461,7 +461,7 @@ long f2fs_sync_meta_pages(struct f2fs_sb_info *sbi, enum page_type type,
461461
if (!folio_clear_dirty_for_io(folio))
462462
goto continue_unlock;
463463

464-
if (__f2fs_write_meta_folio(folio, &wbc,
464+
if (!__f2fs_write_meta_folio(folio, &wbc,
465465
io_type)) {
466466
folio_unlock(folio);
467467
break;
@@ -1409,7 +1409,6 @@ static void commit_checkpoint(struct f2fs_sb_info *sbi,
14091409
* f2fs_sync_meta_pages are combined in this function.
14101410
*/
14111411
struct folio *folio = f2fs_grab_meta_folio(sbi, blk_addr);
1412-
int err;
14131412

14141413
memcpy(folio_address(folio), src, PAGE_SIZE);
14151414

@@ -1418,13 +1417,14 @@ static void commit_checkpoint(struct f2fs_sb_info *sbi,
14181417
f2fs_bug_on(sbi, 1);
14191418

14201419
/* writeout cp pack 2 page */
1421-
err = __f2fs_write_meta_folio(folio, &wbc, FS_CP_META_IO);
1422-
if (unlikely(err && f2fs_cp_error(sbi))) {
1423-
f2fs_folio_put(folio, true);
1424-
return;
1420+
if (unlikely(!__f2fs_write_meta_folio(folio, &wbc, FS_CP_META_IO))) {
1421+
if (f2fs_cp_error(sbi)) {
1422+
f2fs_folio_put(folio, true);
1423+
return;
1424+
}
1425+
f2fs_bug_on(sbi, true);
14251426
}
14261427

1427-
f2fs_bug_on(sbi, err);
14281428
f2fs_folio_put(folio, false);
14291429

14301430
/* submit checkpoint (with barrier if NOBARRIER is not set) */

0 commit comments

Comments
 (0)