diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2024-03-06 16:20:58 +0100 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2024-03-06 16:20:58 +0100 |
| commit | cdf6ac2a03d253f05d3e798f60f23dea1b176b92 (patch) | |
| tree | 5851952559f7f82741a7a951f2b4de18f6eb6437 /fs/fuse | |
| parent | efc4105a4cf9e300b8e9150147415fa235059293 (diff) | |
| download | linux-cdf6ac2a03d253f05d3e798f60f23dea1b176b92.tar.gz linux-cdf6ac2a03d253f05d3e798f60f23dea1b176b92.tar.bz2 linux-cdf6ac2a03d253f05d3e798f60f23dea1b176b92.zip | |
fuse: get rid of ff->readdir.lock
The same protection is provided by file->f_pos_lock.
Note, this relies on the fact that file->f_mode has FMODE_ATOMIC_POS.
This flag is cleared by stream_open(), which would prevent locking of
f_pos_lock.
Prior to commit 7de64d521bf9 ("fuse: break up fuse_open_common()")
FOPEN_STREAM on a directory would cause stream_open() to be called.
After this commit this is not done anymore, so f_pos_lock will always
be locked.
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/fuse')
| -rw-r--r-- | fs/fuse/file.c | 2 | ||||
| -rw-r--r-- | fs/fuse/fuse_i.h | 6 | ||||
| -rw-r--r-- | fs/fuse/readdir.c | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 8b9c5ab0abc0..1b0b9f2a4fbf 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -69,7 +69,6 @@ struct fuse_file *fuse_file_alloc(struct fuse_mount *fm, bool release) } INIT_LIST_HEAD(&ff->write_entry); - mutex_init(&ff->readdir.lock); refcount_set(&ff->count, 1); RB_CLEAR_NODE(&ff->polled_node); init_waitqueue_head(&ff->poll_wait); @@ -82,7 +81,6 @@ struct fuse_file *fuse_file_alloc(struct fuse_mount *fm, bool release) void fuse_file_free(struct fuse_file *ff) { kfree(ff->args); - mutex_destroy(&ff->readdir.lock); kfree(ff); } diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 0f3521449bb4..3658a70ae414 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -243,12 +243,6 @@ struct fuse_file { /* Readdir related */ struct { - /* - * Protects below fields against (crazy) parallel readdir on - * same open file. Uncontended in the normal case. - */ - struct mutex lock; - /* Dir stream position */ loff_t pos; diff --git a/fs/fuse/readdir.c b/fs/fuse/readdir.c index c66a54d6c7d3..0377b6dc24c8 100644 --- a/fs/fuse/readdir.c +++ b/fs/fuse/readdir.c @@ -592,15 +592,11 @@ int fuse_readdir(struct file *file, struct dir_context *ctx) if (fuse_is_bad(inode)) return -EIO; - mutex_lock(&ff->readdir.lock); - err = UNCACHED; if (ff->open_flags & FOPEN_CACHE_DIR) err = fuse_readdir_cached(file, ctx); if (err == UNCACHED) err = fuse_readdir_uncached(file, ctx); - mutex_unlock(&ff->readdir.lock); - return err; } |