GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-05-01 21:04:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fuse: abort: no fc->lock needed for request ending

Browse source 
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>
This commit is contained in:
Miklos Szeredi 2015-07-01 16:26:08 +02:00
parent 46c34a348b
commit ee314a870e
1 changed files with 5 additions and 9 deletions

14
fs/fuse/dev.c
View file

@ -2072,8 +2072,6 @@ static unsigned fuse_dev_poll(struct file *file, poll_table *wait)
* This function releases and reacquires fc->lock * This function releases and reacquires fc->lock
*/ */
static void end_requests(struct fuse_conn *fc, struct list_head *head) static void end_requests(struct fuse_conn *fc, struct list_head *head)
__releases(fc->lock)
__acquires(fc->lock)
{ {
while (!list_empty(head)) { while (!list_empty(head)) {
struct fuse_req *req; struct fuse_req *req;
@ -2082,9 +2080,7 @@ __acquires(fc->lock)
clear_bit(FR_PENDING, &req->flags); clear_bit(FR_PENDING, &req->flags);
clear_bit(FR_SENT, &req->flags); clear_bit(FR_SENT, &req->flags);
list_del_init(&req->list); list_del_init(&req->list);
spin_unlock(&fc->lock);
request_end(fc, req); request_end(fc, req);
spin_lock(&fc->lock);
} }
} }
@ -2160,20 +2156,20 @@ void fuse_abort_conn(struct fuse_conn *fc)
wake_up_all_locked(&fiq->waitq); wake_up_all_locked(&fiq->waitq);
spin_unlock(&fiq->waitq.lock); spin_unlock(&fiq->waitq.lock);
kill_fasync(&fiq->fasync, SIGIO, POLL_IN); 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)) { while (!list_empty(&to_end1)) {
req = list_first_entry(&to_end1, struct fuse_req, list); req = list_first_entry(&to_end1, struct fuse_req, list);
__fuse_get_request(req); __fuse_get_request(req);
list_del_init(&req->list); list_del_init(&req->list);
spin_unlock(&fc->lock);
request_end(fc, req); request_end(fc, req);
spin_lock(&fc->lock);
} }
end_requests(fc, &to_end2); end_requests(fc, &to_end2);
end_polls(fc); } else {
wake_up_all(&fc->blocked_waitq); spin_unlock(&fc->lock);
} }
spin_unlock(&fc->lock);
} }
EXPORT_SYMBOL_GPL(fuse_abort_conn); EXPORT_SYMBOL_GPL(fuse_abort_conn);