diff options
author | Yunlong Song <yunlong.song@huawei.com> | 2016-04-27 20:32:37 +0800 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-04-27 14:10:43 -0700 |
commit | fe216c7a0ff993cdac885109d8544ba02e6f9127 (patch) | |
tree | b54a115a88064435d89568366720baec2ead801c /fs/f2fs/dir.c | |
parent | da011cc0da8cf4a60ddf4d2ae8b42902a3d71e5f (diff) | |
download | linux-stable-fe216c7a0ff993cdac885109d8544ba02e6f9127.tar.gz linux-stable-fe216c7a0ff993cdac885109d8544ba02e6f9127.tar.bz2 linux-stable-fe216c7a0ff993cdac885109d8544ba02e6f9127.zip |
f2fs: fix to return 0 if err == -ENOENT in f2fs_readdir
Commit 57b62d29ad5b384775974973087d47755a8c6fcc ("f2fs: fix to report
error in f2fs_readdir") causes f2fs_readdir to return -ENOENT when
get_lock_data_page returns -ENOENT. However, the original logic is to
continue when get_lock_data_page returns -ENOENT, but it forgets to
reset err to 0.
This will cause getdents64 incorretly return -ENOENT when lastdirent is
NULL in getdents64. This will lead to a wrong return value for syscall
caller.
Signed-off-by: Yunlong Song <yunlong.song@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/dir.c')
-rw-r--r-- | fs/f2fs/dir.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 3b1c14e4eeea..dbfc1d1375a0 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -888,6 +888,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) kunmap(dentry_page); f2fs_put_page(dentry_page, 1); } + err = 0; out: fscrypt_fname_free_buffer(&fstr); return err; |