diff options
Diffstat (limited to 'fs/fuse/fuse_i.h')
-rw-r--r-- | fs/fuse/fuse_i.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index eb3166625ca9..f7c74516f3a6 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h | |||
@@ -65,7 +65,7 @@ struct fuse_inode { | |||
65 | /** FUSE specific file data */ | 65 | /** FUSE specific file data */ |
66 | struct fuse_file { | 66 | struct fuse_file { |
67 | /** Request reserved for flush and release */ | 67 | /** Request reserved for flush and release */ |
68 | struct fuse_req *release_req; | 68 | struct fuse_req *reserved_req; |
69 | 69 | ||
70 | /** File handle used by userspace */ | 70 | /** File handle used by userspace */ |
71 | u64 fh; | 71 | u64 fh; |
@@ -213,6 +213,9 @@ struct fuse_req { | |||
213 | 213 | ||
214 | /** Request completion callback */ | 214 | /** Request completion callback */ |
215 | void (*end)(struct fuse_conn *, struct fuse_req *); | 215 | void (*end)(struct fuse_conn *, struct fuse_req *); |
216 | |||
217 | /** Request is stolen from fuse_file->reserved_req */ | ||
218 | struct file *stolen_file; | ||
216 | }; | 219 | }; |
217 | 220 | ||
218 | /** | 221 | /** |
@@ -456,11 +459,16 @@ struct fuse_req *fuse_request_alloc(void); | |||
456 | void fuse_request_free(struct fuse_req *req); | 459 | void fuse_request_free(struct fuse_req *req); |
457 | 460 | ||
458 | /** | 461 | /** |
459 | * Reserve a preallocated request | 462 | * Get a request, may fail with -ENOMEM |
460 | */ | 463 | */ |
461 | struct fuse_req *fuse_get_req(struct fuse_conn *fc); | 464 | struct fuse_req *fuse_get_req(struct fuse_conn *fc); |
462 | 465 | ||
463 | /** | 466 | /** |
467 | * Gets a requests for a file operation, always succeeds | ||
468 | */ | ||
469 | struct fuse_req *fuse_get_req_nofail(struct fuse_conn *fc, struct file *file); | ||
470 | |||
471 | /** | ||
464 | * Decrement reference count of a request. If count goes to zero free | 472 | * Decrement reference count of a request. If count goes to zero free |
465 | * the request. | 473 | * the request. |
466 | */ | 474 | */ |