openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fuse: cleanup request_end() 

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
Show Stats 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)
{
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)) {
spin_unlock(&fc->lock);
return;
}
req->end = NULL;
spin_lock(&fiq->waitq.lock);
list_del_init(&req->intr_entry);
spin_unlock(&fiq->waitq.lock);
@ -416,8 +414,8 @@ __releases(fc->lock)
}
spin_unlock(&fc->lock);
wake_up(&req->waitq);
if (end)
end(fc, req);
if (req->end)
req->end(fc, req);
fuse_put_request(fc, req);
}