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

Commit d83d0f5b authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: report ENOENT correctly in f2fs_rename 



This fixes wrong error report in f2fs_rename.

Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent c6b1867b

fs/f2fs/namei.c

+4 −2
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	struct f2fs_dir_entry *old_entry;

	struct f2fs_dir_entry *new_entry;

	bool is_old_inline = f2fs_has_inline_dentry(old_dir);

	int err = -ENOENT;

	int err;



	if (unlikely(f2fs_cp_error(sbi)))

		return -EIO;
@@ -844,6 +844,7 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, 
			goto out;

	}



	err = -ENOENT;

	old_entry = f2fs_find_entry(old_dir, &old_dentry->d_name, &old_page);

	if (!old_entry) {

		if (IS_ERR(old_page))
@@ -1009,7 +1010,7 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, 
	struct f2fs_dir_entry *old_dir_entry = NULL, *new_dir_entry = NULL;

	struct f2fs_dir_entry *old_entry, *new_entry;

	int old_nlink = 0, new_nlink = 0;

	int err = -ENOENT;

	int err;



	if (unlikely(f2fs_cp_error(sbi)))

		return -EIO;
@@ -1030,6 +1031,7 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, 
	if (err)

		goto out;



	err = -ENOENT;

	old_entry = f2fs_find_entry(old_dir, &old_dentry->d_name, &old_page);

	if (!old_entry) {

		if (IS_ERR(old_page))