Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3bb910c authored by Sheng Yong's avatar Sheng Yong Committed by Jaegeuk Kim
Browse files

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



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: default avatarSheng Yong <shengyong1@huawei.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 4086d3f6

fs/f2fs/dir.c

+6 −7
Original line number Original line Diff line number Diff line
@@ -207,14 +207,10 @@ static struct f2fs_dir_entry *find_in_level(struct inode *dir, 
		f2fs_put_page(dentry_page, 0);

		f2fs_put_page(dentry_page, 0);

	}

	}





	/* This is to increase the speed of f2fs_create */

	if (!de && room && F2FS_I(dir)->chash != namehash) {

	if (!de && room) {

		F2FS_I(dir)->task = current;

		if (F2FS_I(dir)->chash != namehash) {

		F2FS_I(dir)->chash = namehash;

		F2FS_I(dir)->chash = namehash;

		F2FS_I(dir)->clevel = level;

		F2FS_I(dir)->clevel = level;

	}

	}

	}





	return de;

	return de;

}

}
@@ -254,6 +250,9 @@ struct f2fs_dir_entry *__f2fs_find_entry(struct inode *dir, 
			break;

			break;

	}

	}

out:

out:

	/* This is to increase the speed of f2fs_create */

	if (!de)

		F2FS_I(dir)->task = current;

	return de;

	return de;

}

}