Commit adb298bc authored by Sheng Yong's avatar Sheng Yong Committed by Greg Kroah-Hartman

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

[ Upstream commit d3bb910c ]

Commit 88c5c13a (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: 88c5c13a (f2fs: fix multiple f2fs_add_link() calls having same name)
Signed-off-by: 's avatarSheng Yong <shengyong1@huawei.com>
Reviewed-by: 's avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: 's avatarJaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: 's avatarSasha Levin <sashal@kernel.org>
parent a7e08447
......@@ -212,13 +212,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;
......@@ -259,6 +255,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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment