diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2019-09-10 15:04:08 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2019-09-10 16:29:48 +0200 |
| commit | 40ac7ab2d02176f8a70e37b88e41637ed97b304b (patch) | |
| tree | 08f7c31399e1d49dac232e3c1cae2d3eb6e3532c /fs/fuse/fuse_i.h | |
| parent | 1f4e9d03d1fbff428a0e864d5456e0a2dace6f81 (diff) | |
| download | linux-40ac7ab2d02176f8a70e37b88e41637ed97b304b.tar.bz2 | |
fuse: simplify 'nofail' request
Instead of complex games with a reserved request, just use __GFP_NOFAIL.
Both calers (flush, readdir) guarantee that connection was already
initialized, so no need to wait for fc->initialized.
Also remove unneeded clearing of FR_BACKGROUND flag.
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/fuse/fuse_i.h')
| -rw-r--r-- | fs/fuse/fuse_i.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index a89362ee46d9..dd199391d6b9 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -435,8 +435,6 @@ struct fuse_req { /** Request completion callback */ void (*end)(struct fuse_conn *, struct fuse_req *); - /** Request is stolen from fuse_file->reserved_req */ - struct file *stolen_file; }; struct fuse_iqueue { @@ -580,9 +578,6 @@ struct fuse_conn { /** waitq for blocked connection */ wait_queue_head_t blocked_waitq; - /** waitq for reserved requests */ - wait_queue_head_t reserved_req_waitq; - /** Connection established, cleared on umount, connection abort and device release */ unsigned connected; @@ -927,8 +922,7 @@ void __fuse_get_request(struct fuse_req *req); /** * Gets a requests for a file operation, always succeeds */ -struct fuse_req *fuse_get_req_nofail_nopages(struct fuse_conn *fc, - struct file *file); +struct fuse_req *fuse_get_req_nofail_nopages(struct fuse_conn *fc); /** * Decrement reference count of a request. If count goes to zero free |