summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorGao Xiang <gaoxiang25@huawei.com>2019-02-21 12:57:35 +0800
committerJaegeuk Kim <jaegeuk@kernel.org>2019-03-12 18:59:18 -0700
commit613f3dcdf0d8ffdb3e5d820f6d69076905efddc3 (patch)
tree6e2c6064fd05d88875aad04f0bbc4330a4d67924 /fs
parente46f6bd82c831d20f9b6c149076cf5d2c443d638 (diff)
downloadlinux-613f3dcdf0d8ffdb3e5d820f6d69076905efddc3.tar.bz2
f2fs: no need to take page lock in readdir
VFS will take inode_lock for readdir, therefore no need to take page lock in readdir at all just as the majority of other generic filesystems. This patch improves concurrency since .iterate_shared was introduced to VFS years ago. Signed-off-by: Gao Xiang <gaoxiang25@huawei.com> Reviewed-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/f2fs/dir.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index ba7535399d95..103f3686a045 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -896,7 +896,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)
page_cache_sync_readahead(inode->i_mapping, ra, file, n,
min(npages - n, (pgoff_t)MAX_DIR_RA_PAGES));
- dentry_page = f2fs_get_lock_data_page(inode, n, false);
+ dentry_page = f2fs_find_data_page(inode, n);
if (IS_ERR(dentry_page)) {
err = PTR_ERR(dentry_page);
if (err == -ENOENT) {
@@ -914,11 +914,11 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)
err = f2fs_fill_dentries(ctx, &d,
n * NR_DENTRY_IN_BLOCK, &fstr);
if (err) {
- f2fs_put_page(dentry_page, 1);
+ f2fs_put_page(dentry_page, 0);
break;
}
- f2fs_put_page(dentry_page, 1);
+ f2fs_put_page(dentry_page, 0);
}
out_free:
fscrypt_fname_free_buffer(&fstr);