Commit adb298bc authored Apr 22, 2017 by Sheng Yong Committed by Greg Kroah-Hartman Nov 10, 2018

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



[ Upstream commit d3bb910c15d75ee3340311c64a1c05985bb663a3 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent a7e08447

fs/f2fs/dir.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -212,14 +212,10 @@ 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) {
		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;
		}