diff options
Diffstat (limited to 'fs/fuse')
-rw-r--r-- | fs/fuse/dev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index bba83762c484..87250b6a8682 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c | |||
@@ -299,6 +299,7 @@ static void request_end(struct fuse_conn *fc, struct fuse_req *req) | |||
299 | 299 | ||
300 | static void wait_answer_interruptible(struct fuse_conn *fc, | 300 | static void wait_answer_interruptible(struct fuse_conn *fc, |
301 | struct fuse_req *req) | 301 | struct fuse_req *req) |
302 | __releases(fc->lock) __acquires(fc->lock) | ||
302 | { | 303 | { |
303 | if (signal_pending(current)) | 304 | if (signal_pending(current)) |
304 | return; | 305 | return; |
@@ -315,8 +316,8 @@ static void queue_interrupt(struct fuse_conn *fc, struct fuse_req *req) | |||
315 | kill_fasync(&fc->fasync, SIGIO, POLL_IN); | 316 | kill_fasync(&fc->fasync, SIGIO, POLL_IN); |
316 | } | 317 | } |
317 | 318 | ||
318 | /* Called with fc->lock held. Releases, and then reacquires it. */ | ||
319 | static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req) | 319 | static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req) |
320 | __releases(fc->lock) __acquires(fc->lock) | ||
320 | { | 321 | { |
321 | if (!fc->no_interrupt) { | 322 | if (!fc->no_interrupt) { |
322 | /* Any signal may interrupt this */ | 323 | /* Any signal may interrupt this */ |
@@ -987,6 +988,7 @@ static void end_requests(struct fuse_conn *fc, struct list_head *head) | |||
987 | * locked). | 988 | * locked). |
988 | */ | 989 | */ |
989 | static void end_io_requests(struct fuse_conn *fc) | 990 | static void end_io_requests(struct fuse_conn *fc) |
991 | __releases(fc->lock) __acquires(fc->lock) | ||
990 | { | 992 | { |
991 | while (!list_empty(&fc->io)) { | 993 | while (!list_empty(&fc->io)) { |
992 | struct fuse_req *req = | 994 | struct fuse_req *req = |