Skip to content

Commit

Permalink
fuse: abort: no fc->lock needed for request ending
Browse files Browse the repository at this point in the history
In fuse_abort_conn() when all requests are on private lists we no longer
need fc->lock protection.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Reviewed-by: Ashish Samant <ashish.samant@oracle.com>
  • Loading branch information
Miklos Szeredi committed Jul 1, 2015
1 parent 46c34a3 commit ee314a8
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions fs/fuse/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -2072,8 +2072,6 @@ static unsigned fuse_dev_poll(struct file *file, poll_table *wait)
* This function releases and reacquires fc->lock
*/
static void end_requests(struct fuse_conn *fc, struct list_head *head)
__releases(fc->lock)
__acquires(fc->lock)
{
while (!list_empty(head)) {
struct fuse_req *req;
Expand All @@ -2082,9 +2080,7 @@ __acquires(fc->lock)
clear_bit(FR_PENDING, &req->flags);
clear_bit(FR_SENT, &req->flags);
list_del_init(&req->list);
spin_unlock(&fc->lock);
request_end(fc, req);
spin_lock(&fc->lock);
}
}

Expand Down Expand Up @@ -2160,20 +2156,20 @@ void fuse_abort_conn(struct fuse_conn *fc)
wake_up_all_locked(&fiq->waitq);
spin_unlock(&fiq->waitq.lock);
kill_fasync(&fiq->fasync, SIGIO, POLL_IN);
end_polls(fc);
wake_up_all(&fc->blocked_waitq);
spin_unlock(&fc->lock);

while (!list_empty(&to_end1)) {
req = list_first_entry(&to_end1, struct fuse_req, list);
__fuse_get_request(req);
list_del_init(&req->list);
spin_unlock(&fc->lock);
request_end(fc, req);
spin_lock(&fc->lock);
}
end_requests(fc, &to_end2);
end_polls(fc);
wake_up_all(&fc->blocked_waitq);
} else {
spin_unlock(&fc->lock);
}
spin_unlock(&fc->lock);
}
EXPORT_SYMBOL_GPL(fuse_abort_conn);

Expand Down

0 comments on commit ee314a8

Please sign in to comment.