From: Lihong Kou <koulihong@huawei.com>
Date: Sat, 20 Jun 2020 02:12:17 +0000 (+0800)
Subject: f2fs: make trace enter and end in pairs for unlink
X-Git-Tag: v5.9-rc1~69^2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a99c17dab8ad89ccf77ced5c7f34d840fda7595;p=thirdparty%2Fkernel%2Flinux.git

f2fs: make trace enter and end in pairs for unlink

In the f2fs_unlink we do not add trace end for some
error paths, just add.

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

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index e94e02c6580ac..a15a2831d43b2 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -569,15 +569,17 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)
 
 	trace_f2fs_unlink_enter(dir, dentry);
 
-	if (unlikely(f2fs_cp_error(sbi)))
-		return -EIO;
+	if (unlikely(f2fs_cp_error(sbi))) {
+		err = -EIO;
+		goto fail;
+	}
 
 	err = dquot_initialize(dir);
 	if (err)
-		return err;
+		goto fail;
 	err = dquot_initialize(inode);
 	if (err)
-		return err;
+		goto fail;
 
 	de = f2fs_find_entry(dir, &dentry->d_name, &page);
 	if (!de) {