From 4393318e407fecbedfe22575da1780fb56d428d9 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Wed, 30 Apr 2008 00:54:45 -0700 Subject: [PATCH] --- yaml --- r: 95275 b: refs/heads/master c: 4dbf930ed6c1f8aa992937d0461f8f70d4004aad h: refs/heads/master i: 95273: 23f49bb5b7549609d5b396ea476a00a1ee230a47 95271: 63ca88dbbe7573dd7be2e665abdc5c5a7ab70a7a v: v3 --- [refs] | 2 +- trunk/fs/fuse/dev.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 28d3c724797c..b07559a6dceb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5559b8f4d1f630b8614b6c8e13b8bf6c9c45d7d7 +refs/heads/master: 4dbf930ed6c1f8aa992937d0461f8f70d4004aad diff --git a/trunk/fs/fuse/dev.c b/trunk/fs/fuse/dev.c index bba83762c484..87250b6a8682 100644 --- a/trunk/fs/fuse/dev.c +++ b/trunk/fs/fuse/dev.c @@ -299,6 +299,7 @@ static void request_end(struct fuse_conn *fc, struct fuse_req *req) static void wait_answer_interruptible(struct fuse_conn *fc, struct fuse_req *req) + __releases(fc->lock) __acquires(fc->lock) { if (signal_pending(current)) return; @@ -315,8 +316,8 @@ static void queue_interrupt(struct fuse_conn *fc, struct fuse_req *req) kill_fasync(&fc->fasync, SIGIO, POLL_IN); } -/* Called with fc->lock held. Releases, and then reacquires it. */ static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req) + __releases(fc->lock) __acquires(fc->lock) { if (!fc->no_interrupt) { /* Any signal may interrupt this */ @@ -987,6 +988,7 @@ static void end_requests(struct fuse_conn *fc, struct list_head *head) * locked). */ static void end_io_requests(struct fuse_conn *fc) + __releases(fc->lock) __acquires(fc->lock) { while (!list_empty(&fc->io)) { struct fuse_req *req =