aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunlong Song <yunlong.song@huawei.com>2016-04-27 20:32:37 +0800
committerMister Oyster <oysterized@gmail.com>2017-04-13 12:33:22 +0200
commit923bf77c91b219cf810e1354de8bbe8bf05159d9 (patch)
tree8a9ce1e984bc32fe6fba624b7884d02676be815f
parent7b637bccbd5ed45f01342efdce421d315e1c88d3 (diff)
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>
-rw-r--r--fs/f2fs/dir.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 2413bc681..b1e5b5e69 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -901,6 +901,7 @@ static int f2fs_readdir(struct file *file, void *dirent, filldir_t filldir)
kunmap(dentry_page);
f2fs_put_page(dentry_page, 1);
}
+ err = 0;
out:
fscrypt_fname_free_buffer(&fstr);
return err;