summaryrefslogtreecommitdiffstats
path: root/fs/fuse/dev.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2008-11-26 12:03:54 +0100
committerMiklos Szeredi <miklos@szeredi.hu>2008-11-26 12:03:54 +0100
commite9bb09dd6c5b8ec6a971ed6251df5eba3a4c8d3c (patch)
tree5012a2046330c00f41fd65dc20867b01b80eee5d /fs/fuse/dev.c
parent193da6092764ab693da7170c5badbf60d7758c1d (diff)
downloadop-kernel-dev-e9bb09dd6c5b8ec6a971ed6251df5eba3a4c8d3c.zip
op-kernel-dev-e9bb09dd6c5b8ec6a971ed6251df5eba3a4c8d3c.tar.gz
fuse: don't let fuse_req->end() put the base reference
fuse_req->end() was supposed to be put the base reference but there's no reason why it should. It only makes things more complex. Move it out of ->end() and make it the responsibility of request_end(). Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Diffstat (limited to 'fs/fuse/dev.c')
-rw-r--r--fs/fuse/dev.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 85a23bb..225388f 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -293,8 +293,7 @@ static void request_end(struct fuse_conn *fc, struct fuse_req *req)
wake_up(&req->waitq);
if (end)
end(fc, req);
- else
- fuse_put_request(fc, req);
+ fuse_put_request(fc, req);
}
static void wait_answer_interruptible(struct fuse_conn *fc,
@@ -1006,11 +1005,11 @@ static void end_io_requests(struct fuse_conn *fc)
wake_up(&req->waitq);
if (end) {
req->end = NULL;
- /* The end function will consume this reference */
__fuse_get_request(req);
spin_unlock(&fc->lock);
wait_event(req->waitq, !req->locked);
end(fc, req);
+ fuse_put_request(fc, req);
spin_lock(&fc->lock);
}
}
OpenPOWER on IntegriCloud