diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-05-27 10:10:41 -0700 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-13 12:33:42 +0200 |
| commit | c9290cabee18f3cfa3a9916fbfc11eea7f71c9b8 (patch) | |
| tree | 570557f07d4bf4fd5a8dac7198bda9c587fc1983 | |
| parent | da1763768f2497a7c4abb9b3a0404ac95a5d693d (diff) | |
| download | android_kernel_m2note-c9290cabee18f3cfa3a9916fbfc11eea7f71c9b8.tar.gz | |
f2fs: return error of f2fs_lookup
Now we can report an error to f2fs_lookup given by f2fs_find_entry.
Suggested-by: He YunLei <heyunlei@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fs/f2fs/dir.c | 2 | ||||
| -rw-r--r-- | fs/f2fs/namei.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 94fcec996..bfbfb1085 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -231,7 +231,7 @@ struct f2fs_dir_entry *f2fs_find_entry(struct inode *dir, struct qstr *child, err = fscrypt_setup_filename(dir, child, 1, &fname); if (err) { - *res_page = ERR_PTR(-ENOMEM); + *res_page = ERR_PTR(err); return NULL; } diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index 95471a974..d6d2cb9a8 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -288,8 +288,11 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry, return ERR_PTR(-ENAMETOOLONG); de = f2fs_find_entry(dir, &dentry->d_name, &page); - if (!de) + if (!de) { + if (IS_ERR(page)) + return (struct dentry *)page; return d_splice_alias(inode, dentry); + } ino = le32_to_cpu(de->ino); f2fs_dentry_kunmap(dir, page); |