aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fuse/dev.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-12-02 08:49:42 -0500
committerMiklos Szeredi <mszeredi@suse.de>2008-12-02 08:49:42 -0500
commit5d9ec854bfb6f1e122b1d96b344164a71eac5be8 (patch)
treeed74270562b414a35919da5b0fa372e10ebaf254 /fs/fuse/dev.c
parentc9f0523d88fd208ce094995a0ac63f7c04e56bab (diff)
fuse: clean up annotations of fc->lock
Makes the existing annotations match the more common one per line style and adds a few missing annotations. Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Diffstat (limited to 'fs/fuse/dev.c')
-rw-r--r--fs/fuse/dev.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 3c44ce359a00..69ebf2ecb089 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -269,7 +269,7 @@ static void flush_bg_queue(struct fuse_conn *fc)
269 * Called with fc->lock, unlocks it 269 * Called with fc->lock, unlocks it
270 */ 270 */
271static void request_end(struct fuse_conn *fc, struct fuse_req *req) 271static void request_end(struct fuse_conn *fc, struct fuse_req *req)
272 __releases(fc->lock) 272__releases(&fc->lock)
273{ 273{
274 void (*end) (struct fuse_conn *, struct fuse_req *) = req->end; 274 void (*end) (struct fuse_conn *, struct fuse_req *) = req->end;
275 req->end = NULL; 275 req->end = NULL;
@@ -298,7 +298,8 @@ static void request_end(struct fuse_conn *fc, struct fuse_req *req)
298 298
299static void wait_answer_interruptible(struct fuse_conn *fc, 299static void wait_answer_interruptible(struct fuse_conn *fc,
300 struct fuse_req *req) 300 struct fuse_req *req)
301 __releases(fc->lock) __acquires(fc->lock) 301__releases(&fc->lock)
302__acquires(&fc->lock)
302{ 303{
303 if (signal_pending(current)) 304 if (signal_pending(current))
304 return; 305 return;
@@ -316,7 +317,8 @@ static void queue_interrupt(struct fuse_conn *fc, struct fuse_req *req)
316} 317}
317 318
318static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req) 319static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req)
319 __releases(fc->lock) __acquires(fc->lock) 320__releases(&fc->lock)
321__acquires(&fc->lock)
320{ 322{
321 if (!fc->no_interrupt) { 323 if (!fc->no_interrupt) {
322 /* Any signal may interrupt this */ 324 /* Any signal may interrupt this */
@@ -668,6 +670,8 @@ static int request_pending(struct fuse_conn *fc)
668 670
669/* Wait until a request is available on the pending list */ 671/* Wait until a request is available on the pending list */
670static void request_wait(struct fuse_conn *fc) 672static void request_wait(struct fuse_conn *fc)
673__releases(&fc->lock)
674__acquires(&fc->lock)
671{ 675{
672 DECLARE_WAITQUEUE(wait, current); 676 DECLARE_WAITQUEUE(wait, current);
673 677
@@ -695,7 +699,7 @@ static void request_wait(struct fuse_conn *fc)
695 */ 699 */
696static int fuse_read_interrupt(struct fuse_conn *fc, struct fuse_req *req, 700static int fuse_read_interrupt(struct fuse_conn *fc, struct fuse_req *req,
697 const struct iovec *iov, unsigned long nr_segs) 701 const struct iovec *iov, unsigned long nr_segs)
698 __releases(fc->lock) 702__releases(&fc->lock)
699{ 703{
700 struct fuse_copy_state cs; 704 struct fuse_copy_state cs;
701 struct fuse_in_header ih; 705 struct fuse_in_header ih;
@@ -1012,6 +1016,8 @@ static unsigned fuse_dev_poll(struct file *file, poll_table *wait)
1012 * This function releases and reacquires fc->lock 1016 * This function releases and reacquires fc->lock
1013 */ 1017 */
1014static void end_requests(struct fuse_conn *fc, struct list_head *head) 1018static void end_requests(struct fuse_conn *fc, struct list_head *head)
1019__releases(&fc->lock)
1020__acquires(&fc->lock)
1015{ 1021{
1016 while (!list_empty(head)) { 1022 while (!list_empty(head)) {
1017 struct fuse_req *req; 1023 struct fuse_req *req;
@@ -1034,7 +1040,8 @@ static void end_requests(struct fuse_conn *fc, struct list_head *head)
1034 * locked). 1040 * locked).
1035 */ 1041 */
1036static void end_io_requests(struct fuse_conn *fc) 1042static void end_io_requests(struct fuse_conn *fc)
1037 __releases(fc->lock) __acquires(fc->lock) 1043__releases(&fc->lock)
1044__acquires(&fc->lock)
1038{ 1045{
1039 while (!list_empty(&fc->io)) { 1046 while (!list_empty(&fc->io)) {
1040 struct fuse_req *req = 1047 struct fuse_req *req =