Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

f2fs: remove unneeded f2fs_{,un}lock_op in do_recover_data() 



Protecting recovery flow by using cp_rwsem is not needed, since we have
prevent triggering any checkpoint by locking cp_mutex previously.

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

fs/f2fs/recovery.c

+1 −6
Original line number Diff line number Diff line
@@ -383,15 +383,11 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode, 
	start = start_bidx_of_node(ofs_of_node(page), fi);

	end = start + ADDRS_PER_PAGE(page, fi);



	f2fs_lock_op(sbi);



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



	err = get_dnode_of_data(&dn, start, ALLOC_NODE);

	if (err) {

		f2fs_unlock_op(sbi);

	if (err)

		goto out;

	}



	f2fs_wait_on_page_writeback(dn.node_page, NODE);
@@ -456,7 +452,6 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode, 
	set_page_dirty(dn.node_page);

err:

	f2fs_put_dnode(&dn);

	f2fs_unlock_op(sbi);

out:

	f2fs_msg(sbi->sb, KERN_NOTICE,

		"recover_data: ino = %lx, recovered = %d blocks, err = %d",