Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

f2fs: change the unlock parameter of f2fs_put_page to bool

Change the type of the unlock parameter of f2fs_put_page to bool.
All callers should consistently pass true or false. No logical change.

Signed-off-by: Yongpeng Yang <yangyongpeng@xiaomi.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

authored by

Yongpeng Yang and committed by
Jaegeuk Kim
89c16629 d33f89b3

+14 -16
+4 -4
fs/f2fs/compress.c
··· 120 120 } 121 121 122 122 static void f2fs_put_rpages_wbc(struct compress_ctx *cc, 123 - struct writeback_control *wbc, bool redirty, int unlock) 123 + struct writeback_control *wbc, bool redirty, bool unlock) 124 124 { 125 125 unsigned int i; 126 126 ··· 1202 1202 if (copied) 1203 1203 set_cluster_dirty(&cc); 1204 1204 1205 - f2fs_put_rpages_wbc(&cc, NULL, false, 1); 1205 + f2fs_put_rpages_wbc(&cc, NULL, false, true); 1206 1206 f2fs_destroy_compress_ctx(&cc, false); 1207 1207 1208 1208 return first_index; ··· 1605 1605 add_compr_block_stat(cc->inode, cc->cluster_size); 1606 1606 goto write; 1607 1607 } else if (err) { 1608 - f2fs_put_rpages_wbc(cc, wbc, true, 1); 1608 + f2fs_put_rpages_wbc(cc, wbc, true, true); 1609 1609 goto destroy_out; 1610 1610 } 1611 1611 ··· 1619 1619 f2fs_bug_on(F2FS_I_SB(cc->inode), *submitted); 1620 1620 1621 1621 err = f2fs_write_raw_pages(cc, submitted, wbc, io_type); 1622 - f2fs_put_rpages_wbc(cc, wbc, false, 0); 1622 + f2fs_put_rpages_wbc(cc, wbc, false, false); 1623 1623 destroy_out: 1624 1624 f2fs_destroy_compress_ctx(cc, false); 1625 1625 return err;
+2 -4
fs/f2fs/data.c
··· 3656 3656 return 0; 3657 3657 3658 3658 put_folio: 3659 - folio_unlock(folio); 3660 - folio_put(folio); 3659 + f2fs_folio_put(folio, true); 3661 3660 fail: 3662 3661 f2fs_write_failed(inode, pos + len); 3663 3662 return err; ··· 3712 3713 pos + copied); 3713 3714 } 3714 3715 unlock_out: 3715 - folio_unlock(folio); 3716 - folio_put(folio); 3716 + f2fs_folio_put(folio, true); 3717 3717 f2fs_update_time(F2FS_I_SB(inode), REQ_TIME); 3718 3718 return copied; 3719 3719 }
+1 -1
fs/f2fs/f2fs.h
··· 2971 2971 folio_put(folio); 2972 2972 } 2973 2973 2974 - static inline void f2fs_put_page(struct page *page, int unlock) 2974 + static inline void f2fs_put_page(struct page *page, bool unlock) 2975 2975 { 2976 2976 if (!page) 2977 2977 return;
+3 -3
fs/f2fs/gc.c
··· 1278 1278 err = f2fs_submit_page_bio(&fio); 1279 1279 if (err) 1280 1280 goto put_encrypted_page; 1281 - f2fs_put_page(fio.encrypted_page, 0); 1281 + f2fs_put_page(fio.encrypted_page, false); 1282 1282 f2fs_folio_put(folio, true); 1283 1283 1284 1284 f2fs_update_iostat(sbi, inode, FS_DATA_READ_IO, F2FS_BLKSIZE); ··· 1286 1286 1287 1287 return 0; 1288 1288 put_encrypted_page: 1289 - f2fs_put_page(fio.encrypted_page, 1); 1289 + f2fs_put_page(fio.encrypted_page, true); 1290 1290 put_folio: 1291 1291 f2fs_folio_put(folio, true); 1292 1292 return err; ··· 1442 1442 f2fs_update_data_blkaddr(&dn, newaddr); 1443 1443 set_inode_flag(inode, FI_APPEND_WRITE); 1444 1444 1445 - f2fs_put_page(fio.encrypted_page, 1); 1445 + f2fs_put_page(fio.encrypted_page, true); 1446 1446 recover_block: 1447 1447 if (err) 1448 1448 f2fs_do_replace_block(fio.sbi, &sum, newaddr, fio.old_blkaddr,
+2 -2
fs/f2fs/inline.c
··· 287 287 set_inode_flag(inode, FI_DATA_EXIST); 288 288 289 289 folio_clear_f2fs_inline(ifolio); 290 - f2fs_folio_put(ifolio, 1); 290 + f2fs_folio_put(ifolio, true); 291 291 return 0; 292 292 } 293 293 ··· 577 577 f2fs_i_depth_write(dir, 0); 578 578 f2fs_i_size_write(dir, MAX_INLINE_DATA(dir)); 579 579 folio_mark_dirty(ifolio); 580 - f2fs_folio_put(ifolio, 1); 580 + f2fs_folio_put(ifolio, true); 581 581 582 582 kfree(backup_dentry); 583 583 return err;
+2 -2
fs/f2fs/namei.c
··· 1249 1249 return 0; 1250 1250 out_new_dir: 1251 1251 if (new_dir_entry) { 1252 - f2fs_folio_put(new_dir_folio, 0); 1252 + f2fs_folio_put(new_dir_folio, false); 1253 1253 } 1254 1254 out_old_dir: 1255 1255 if (old_dir_entry) { 1256 - f2fs_folio_put(old_dir_folio, 0); 1256 + f2fs_folio_put(old_dir_folio, false); 1257 1257 } 1258 1258 out_new: 1259 1259 f2fs_folio_put(new_folio, false);