From: Chao Yu <yuchao0@huawei.com>
Date: Thu, 11 Jan 2018 06:37:35 +0000 (+0800)
Subject: f2fs: fix to cover f2fs_inline_data_fiemap with inode_lock
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f1b43d4cd5f2563f0f1bb2c84eff94faa4c2853b;p=openwrt%2Fstaging%2Fblogic.git

f2fs: fix to cover f2fs_inline_data_fiemap with inode_lock

This patch fix to cover f2fs_inline_data_fiemap with inode_lock in order
to make that interface avoiding race with mapping change.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 31add841ec39..664fe0aa18bb 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1154,14 +1154,14 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
 	if (ret)
 		return ret;
 
+	inode_lock(inode);
+
 	if (f2fs_has_inline_data(inode)) {
 		ret = f2fs_inline_data_fiemap(inode, fieinfo, start, len);
 		if (ret != -EAGAIN)
-			return ret;
+			goto out;
 	}
 
-	inode_lock(inode);
-
 	if (logical_to_blk(inode, len) == 0)
 		len = blk_to_logical(inode, 1);