Commit 3104af35 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: reduce covered region of sbi->cp_rwsem in f2fs_map_blocks 



Only cover sbi->cp_rwsem on one dnode page's allocation and modification
instead of multiple's in f2fs_map_blocks, it can reduce the covered region
of cp_rwsem, then we can avoid potential long time delay for concurrent
checkpointer.

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 93bae099

fs/f2fs/data.c

+7 −2
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, 
	}



	if (create)

		f2fs_lock_op(F2FS_I_SB(inode));

		f2fs_lock_op(sbi);



	/* When reading holes, we need its node page */

	set_new_dnode(&dn, inode, NULL, NULL, 0);
@@ -647,6 +647,11 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, 
		allocated = false;

		f2fs_put_dnode(&dn);



		if (create) {

			f2fs_unlock_op(sbi);

			f2fs_lock_op(sbi);

		}



		set_new_dnode(&dn, inode, NULL, NULL, 0);

		err = get_dnode_of_data(&dn, pgofs, mode);

		if (err) {
@@ -702,7 +707,7 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, 
	f2fs_put_dnode(&dn);

unlock_out:

	if (create)

		f2fs_unlock_op(F2FS_I_SB(inode));

		f2fs_unlock_op(sbi);

out:

	trace_f2fs_map_blocks(inode, map, err);

	return err;