]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
fuse: cache readdir calls if filesystem opts out of opendir
authorChad Austin <chadaustin@fb.com>
Tue, 29 Jan 2019 00:34:34 +0000 (16:34 -0800)
committerMiklos Szeredi <mszeredi@redhat.com>
Wed, 13 Feb 2019 12:15:15 +0000 (13:15 +0100)
If a filesystem returns ENOSYS from opendir and thus opts out of
opendir and releasedir requests, it almost certainly would also like
readdir results cached. Default open_flags to FOPEN_KEEP_CACHE and
FOPEN_CACHE_DIR in that case.

With this patch, I've measured recursive directory enumeration across
large FUSE mounts to be faster than native mounts.

Signed-off-by: Chad Austin <chadaustin@fb.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
fs/fuse/file.c

index cc6ffd23b80f75e2a5e069bb44a1572baff164c0..06096b60f1df23cb60234fe2fe3ce2ddc2b39c4e 100644 (file)
@@ -124,7 +124,8 @@ int fuse_do_open(struct fuse_conn *fc, u64 nodeid, struct file *file,
                return -ENOMEM;
 
        ff->fh = 0;
-       ff->open_flags = FOPEN_KEEP_CACHE; /* Default for no-open */
+       /* Default for no-open */
+       ff->open_flags = FOPEN_KEEP_CACHE | (isdir ? FOPEN_CACHE_DIR : 0);
        if (isdir ? !fc->no_opendir : !fc->no_open) {
                struct fuse_open_out outarg;
                int err;