Commit a9419b63 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: do not bother checkpoint by f2fs_get_node_info 



This patch tries to mitigate lock contention between f2fs_write_checkpoint and
f2fs_get_node_info along with nat_tree_lock.

The idea is, if checkpoint is currently running, other threads that try to grab
nat_tree_lock would be better to wait for checkpoint.

Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 0df035c7

fs/f2fs/checkpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static int recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino) 
	/* truncate all the data during iput */

	iput(inode);



	err = f2fs_get_node_info(sbi, ino, &ni);

	err = f2fs_get_node_info(sbi, ino, &ni, false);

	if (err)

		goto err_out;

fs/f2fs/compress.c

+1 −1
Original line number Diff line number Diff line
@@ -1286,7 +1286,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc, 


	psize = (loff_t)(cc->rpages[last_index]->index + 1) << PAGE_SHIFT;



	err = f2fs_get_node_info(fio.sbi, dn.nid, &ni);

	err = f2fs_get_node_info(fio.sbi, dn.nid, &ni, false);

	if (err)

		goto out_put_dnode;

fs/f2fs/data.c

+4 −4
Original line number Diff line number Diff line
@@ -1355,7 +1355,7 @@ static int __allocate_data_block(struct dnode_of_data *dn, int seg_type) 
	if (unlikely(is_inode_flag_set(dn->inode, FI_NO_ALLOC)))

		return -EPERM;



	err = f2fs_get_node_info(sbi, dn->nid, &ni);

	err = f2fs_get_node_info(sbi, dn->nid, &ni, false);

	if (err)

		return err;
@@ -1757,7 +1757,7 @@ static int f2fs_xattr_fiemap(struct inode *inode, 
		if (!page)

			return -ENOMEM;



		err = f2fs_get_node_info(sbi, inode->i_ino, &ni);

		err = f2fs_get_node_info(sbi, inode->i_ino, &ni, false);

		if (err) {

			f2fs_put_page(page, 1);

			return err;
@@ -1789,7 +1789,7 @@ static int f2fs_xattr_fiemap(struct inode *inode, 
		if (!page)

			return -ENOMEM;



		err = f2fs_get_node_info(sbi, xnid, &ni);

		err = f2fs_get_node_info(sbi, xnid, &ni, false);

		if (err) {

			f2fs_put_page(page, 1);

			return err;
@@ -2649,7 +2649,7 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 
		fio->need_lock = LOCK_REQ;

	}



	err = f2fs_get_node_info(fio->sbi, dn.nid, &ni);

	err = f2fs_get_node_info(fio->sbi, dn.nid, &ni, false);

	if (err)

		goto out_writepage;

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -3412,7 +3412,7 @@ int f2fs_need_dentry_mark(struct f2fs_sb_info *sbi, nid_t nid); 
bool f2fs_is_checkpointed_node(struct f2fs_sb_info *sbi, nid_t nid);

bool f2fs_need_inode_block_update(struct f2fs_sb_info *sbi, nid_t ino);

int f2fs_get_node_info(struct f2fs_sb_info *sbi, nid_t nid,

						struct node_info *ni);

				struct node_info *ni, bool checkpoint_context);

pgoff_t f2fs_get_next_page_offset(struct dnode_of_data *dn, pgoff_t pgofs);

int f2fs_get_dnode_of_data(struct dnode_of_data *dn, pgoff_t index, int mode);

int f2fs_truncate_inode_blocks(struct inode *inode, pgoff_t from);

fs/f2fs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1233,7 +1233,7 @@ static int __clone_blkaddrs(struct inode *src_inode, struct inode *dst_inode, 
			if (ret)

				return ret;



			ret = f2fs_get_node_info(sbi, dn.nid, &ni);

			ret = f2fs_get_node_info(sbi, dn.nid, &ni, false);

			if (ret) {

				f2fs_put_dnode(&dn);

				return ret;