f2fs: report ENOENT correctly in f2fs_rename
This fixes wrong error report in f2fs_rename. Reviewed-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
parent
c6b1867b1d
commit
d83d0f5ba8
1 changed files with 4 additions and 2 deletions
|
@ -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 *old_entry;
|
||||||
struct f2fs_dir_entry *new_entry;
|
struct f2fs_dir_entry *new_entry;
|
||||||
bool is_old_inline = f2fs_has_inline_dentry(old_dir);
|
bool is_old_inline = f2fs_has_inline_dentry(old_dir);
|
||||||
int err = -ENOENT;
|
int err;
|
||||||
|
|
||||||
if (unlikely(f2fs_cp_error(sbi)))
|
if (unlikely(f2fs_cp_error(sbi)))
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
@ -844,6 +844,7 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err = -ENOENT;
|
||||||
old_entry = f2fs_find_entry(old_dir, &old_dentry->d_name, &old_page);
|
old_entry = f2fs_find_entry(old_dir, &old_dentry->d_name, &old_page);
|
||||||
if (!old_entry) {
|
if (!old_entry) {
|
||||||
if (IS_ERR(old_page))
|
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_dir_entry = NULL, *new_dir_entry = NULL;
|
||||||
struct f2fs_dir_entry *old_entry, *new_entry;
|
struct f2fs_dir_entry *old_entry, *new_entry;
|
||||||
int old_nlink = 0, new_nlink = 0;
|
int old_nlink = 0, new_nlink = 0;
|
||||||
int err = -ENOENT;
|
int err;
|
||||||
|
|
||||||
if (unlikely(f2fs_cp_error(sbi)))
|
if (unlikely(f2fs_cp_error(sbi)))
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
@ -1030,6 +1031,7 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,
|
||||||
if (err)
|
if (err)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
err = -ENOENT;
|
||||||
old_entry = f2fs_find_entry(old_dir, &old_dentry->d_name, &old_page);
|
old_entry = f2fs_find_entry(old_dir, &old_dentry->d_name, &old_page);
|
||||||
if (!old_entry) {
|
if (!old_entry) {
|
||||||
if (IS_ERR(old_page))
|
if (IS_ERR(old_page))
|
||||||
|
|
Loading…
Reference in a new issue