forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fuse: cleanup request_end()

Browse source 
Now that we atomically test having already done everything we no longer
need other 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:07 +02:00
parent 365ae710df
commit 1e6881c36e
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fs/fuse/dev.c
View file

@ -383,14 +383,12 @@ static void request_end(struct fuse_conn *fc, struct fuse_req *req)
__releases(fc->lock) __releases(fc->lock)
{ {
struct fuse_iqueue *fiq = &fc->iq; struct fuse_iqueue *fiq = &fc->iq;
void (*end) (struct fuse_conn *, struct fuse_req *) = req->end;
if (test_and_set_bit(FR_FINISHED, &req->flags)) { if (test_and_set_bit(FR_FINISHED, &req->flags)) {
spin_unlock(&fc->lock); spin_unlock(&fc->lock);
return; return;
} }
req->end = NULL;
spin_lock(&fiq->waitq.lock); spin_lock(&fiq->waitq.lock);
list_del_init(&req->intr_entry); list_del_init(&req->intr_entry);
spin_unlock(&fiq->waitq.lock); spin_unlock(&fiq->waitq.lock);
@ -416,8 +414,8 @@ __releases(fc->lock)
} }
spin_unlock(&fc->lock); spin_unlock(&fc->lock);
wake_up(&req->waitq); wake_up(&req->waitq);
if (end) if (req->end)
end(fc, req); req->end(fc, req);
fuse_put_request(fc, req); fuse_put_request(fc, req);
} }