Commit 89c16629 authored by Yongpeng Yang's avatar Yongpeng Yang Committed by Jaegeuk Kim
Browse files

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: default avatarYongpeng Yang <yangyongpeng@xiaomi.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent d33f89b3

fs/f2fs/compress.c

+4 −4
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static void f2fs_unlock_rpages(struct compress_ctx *cc, int len) 
}



static void f2fs_put_rpages_wbc(struct compress_ctx *cc,

		struct writeback_control *wbc, bool redirty, int unlock)

		struct writeback_control *wbc, bool redirty, bool unlock)

{

	unsigned int i;
@@ -1202,7 +1202,7 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata, 
	if (copied)

		set_cluster_dirty(&cc);



	f2fs_put_rpages_wbc(&cc, NULL, false, 1);

	f2fs_put_rpages_wbc(&cc, NULL, false, true);

	f2fs_destroy_compress_ctx(&cc, false);



	return first_index;
@@ -1605,7 +1605,7 @@ int f2fs_write_multi_pages(struct compress_ctx *cc, 
			add_compr_block_stat(cc->inode, cc->cluster_size);

			goto write;

		} else if (err) {

			f2fs_put_rpages_wbc(cc, wbc, true, 1);

			f2fs_put_rpages_wbc(cc, wbc, true, true);

			goto destroy_out;

		}
@@ -1619,7 +1619,7 @@ int f2fs_write_multi_pages(struct compress_ctx *cc, 
	f2fs_bug_on(F2FS_I_SB(cc->inode), *submitted);



	err = f2fs_write_raw_pages(cc, submitted, wbc, io_type);

	f2fs_put_rpages_wbc(cc, wbc, false, 0);

	f2fs_put_rpages_wbc(cc, wbc, false, false);

destroy_out:

	f2fs_destroy_compress_ctx(cc, false);

	return err;

fs/f2fs/data.c

+2 −4
Original line number Diff line number Diff line
@@ -3656,8 +3656,7 @@ static int f2fs_write_begin(const struct kiocb *iocb, 
	return 0;



put_folio:

	folio_unlock(folio);

	folio_put(folio);

	f2fs_folio_put(folio, true);

fail:

	f2fs_write_failed(inode, pos + len);

	return err;
@@ -3713,8 +3712,7 @@ static int f2fs_write_end(const struct kiocb *iocb, 
					pos + copied);

	}

unlock_out:

	folio_unlock(folio);

	folio_put(folio);

	f2fs_folio_put(folio, true);

	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);

	return copied;

}

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2971,7 +2971,7 @@ static inline void f2fs_folio_put(struct folio *folio, bool unlock) 
	folio_put(folio);

}



static inline void f2fs_put_page(struct page *page, int unlock)

static inline void f2fs_put_page(struct page *page, bool unlock)

{

	if (!page)

		return;

fs/f2fs/gc.c

+3 −3
Original line number Diff line number Diff line
@@ -1278,7 +1278,7 @@ static int ra_data_block(struct inode *inode, pgoff_t index) 
	err = f2fs_submit_page_bio(&fio);

	if (err)

		goto put_encrypted_page;

	f2fs_put_page(fio.encrypted_page, 0);

	f2fs_put_page(fio.encrypted_page, false);

	f2fs_folio_put(folio, true);



	f2fs_update_iostat(sbi, inode, FS_DATA_READ_IO, F2FS_BLKSIZE);
@@ -1286,7 +1286,7 @@ static int ra_data_block(struct inode *inode, pgoff_t index) 


	return 0;

put_encrypted_page:

	f2fs_put_page(fio.encrypted_page, 1);

	f2fs_put_page(fio.encrypted_page, true);

put_folio:

	f2fs_folio_put(folio, true);

	return err;
@@ -1442,7 +1442,7 @@ static int move_data_block(struct inode *inode, block_t bidx, 
	f2fs_update_data_blkaddr(&dn, newaddr);

	set_inode_flag(inode, FI_APPEND_WRITE);



	f2fs_put_page(fio.encrypted_page, 1);

	f2fs_put_page(fio.encrypted_page, true);

recover_block:

	if (err)

		f2fs_do_replace_block(fio.sbi, &sum, newaddr, fio.old_blkaddr,

fs/f2fs/inline.c

+2 −2
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ int f2fs_write_inline_data(struct inode *inode, struct folio *folio) 
	set_inode_flag(inode, FI_DATA_EXIST);



	folio_clear_f2fs_inline(ifolio);

	f2fs_folio_put(ifolio, 1);

	f2fs_folio_put(ifolio, true);

	return 0;

}
@@ -577,7 +577,7 @@ static int f2fs_move_rehashed_dirents(struct inode *dir, struct folio *ifolio, 
	f2fs_i_depth_write(dir, 0);

	f2fs_i_size_write(dir, MAX_INLINE_DATA(dir));

	folio_mark_dirty(ifolio);

	f2fs_folio_put(ifolio, 1);

	f2fs_folio_put(ifolio, true);



	kfree(backup_dentry);

	return err;