f2fs: fix multiple f2fs_add_link() having same name for inline dentry

Commit 88c5c13a5027 (f2fs: fix multiple f2fs_add_link() calls having
same name) does not cover the scenario where inline dentry is enabled.
In that case, F2FS_I(dir)->task will be NULL, and __f2fs_add_link will
lookup dentries one more time.

This patch fixes it by moving the assigment of current task to a upper
level to cover both normal and inline dentry.

Cc: <stable@vger.kernel.org>
Fixes: 88c5c13a5027 (f2fs: fix multiple f2fs_add_link() calls having same name)
Signed-off-by: Sheng Yong <shengyong1@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

1 files changed, 6 insertions, 7 deletions

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index c143dffcae6e..b8c62e9669bc 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -207,13 +207,9 @@ static struct f2fs_dir_entry *find_in_level(struct inode *dir,
                 f2fs_put_page(dentry_page, 0);
         }
 
-        /* This is to increase the speed of f2fs_create */
-        if (!de && room) {
-                F2FS_I(dir)->task = current;
-                if (F2FS_I(dir)->chash != namehash) {
-                        F2FS_I(dir)->chash = namehash;
-                        F2FS_I(dir)->clevel = level;
-                }
+        if (!de && room && F2FS_I(dir)->chash != namehash) {
+                F2FS_I(dir)->chash = namehash;
+                F2FS_I(dir)->clevel = level;
         }
 
         return de;
@@ -254,6 +250,9 @@ struct f2fs_dir_entry *__f2fs_find_entry(struct inode *dir,
                         break;
         }
 out:
+        /* This is to increase the speed of f2fs_create */
+        if (!de)
+                F2FS_I(dir)->task = current;
         return de;
 }