@@ -340,7 +340,7 @@ void f2fs_ra_meta_pages_cond(struct f2fs_sb_info *sbi, pgoff_t index,
340
340
f2fs_ra_meta_pages (sbi , index , ra_blocks , META_POR , true);
341
341
}
342
342
343
- static int __f2fs_write_meta_folio (struct folio * folio ,
343
+ static bool __f2fs_write_meta_folio (struct folio * folio ,
344
344
struct writeback_control * wbc ,
345
345
enum iostat_type io_type )
346
346
{
@@ -353,7 +353,7 @@ static int __f2fs_write_meta_folio(struct folio *folio,
353
353
folio_clear_uptodate (folio );
354
354
dec_page_count (sbi , F2FS_DIRTY_META );
355
355
folio_unlock (folio );
356
- return 0 ;
356
+ return true ;
357
357
}
358
358
goto redirty_out ;
359
359
}
@@ -373,11 +373,11 @@ static int __f2fs_write_meta_folio(struct folio *folio,
373
373
if (unlikely (f2fs_cp_error (sbi )))
374
374
f2fs_submit_merged_write (sbi , META );
375
375
376
- return 0 ;
376
+ return true ;
377
377
378
378
redirty_out :
379
379
folio_redirty_for_writepage (wbc , folio );
380
- return AOP_WRITEPAGE_ACTIVATE ;
380
+ return false ;
381
381
}
382
382
383
383
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,
461
461
if (!folio_clear_dirty_for_io (folio ))
462
462
goto continue_unlock ;
463
463
464
- if (__f2fs_write_meta_folio (folio , & wbc ,
464
+ if (! __f2fs_write_meta_folio (folio , & wbc ,
465
465
io_type )) {
466
466
folio_unlock (folio );
467
467
break ;
@@ -1409,7 +1409,6 @@ static void commit_checkpoint(struct f2fs_sb_info *sbi,
1409
1409
* f2fs_sync_meta_pages are combined in this function.
1410
1410
*/
1411
1411
struct folio * folio = f2fs_grab_meta_folio (sbi , blk_addr );
1412
- int err ;
1413
1412
1414
1413
memcpy (folio_address (folio ), src , PAGE_SIZE );
1415
1414
@@ -1418,13 +1417,14 @@ static void commit_checkpoint(struct f2fs_sb_info *sbi,
1418
1417
f2fs_bug_on (sbi , 1 );
1419
1418
1420
1419
/* 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);
1425
1426
}
1426
1427
1427
- f2fs_bug_on (sbi , err );
1428
1428
f2fs_folio_put (folio , false);
1429
1429
1430
1430
/* submit checkpoint (with barrier if NOBARRIER is not set) */
0 commit comments