Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-14 08:02:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fuse: don't let fuse_req->end() put the base reference

Browse Source 
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>
This commit is contained in:
Tejun Heo 2008-11-26 12:03:54 +01:00 committed by Miklos Szeredi
parent 193da60927
commit e9bb09dd6c
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/fuse/dev.c
View File

@ -293,7 +293,6 @@ static void request_end(struct fuse_conn *fc, struct fuse_req *req)
wake_up(&req->waitq); wake_up(&req->waitq);
if (end) if (end)
end(fc, req); end(fc, req);
else
fuse_put_request(fc, req); fuse_put_request(fc, req);
} }
@ -1006,11 +1005,11 @@ static void end_io_requests(struct fuse_conn *fc)
wake_up(&req->waitq); wake_up(&req->waitq);
if (end) { if (end) {
req->end = NULL; req->end = NULL;
/* The end function will consume this reference */
__fuse_get_request(req); __fuse_get_request(req);
spin_unlock(&fc->lock); spin_unlock(&fc->lock);
wait_event(req->waitq, !req->locked); wait_event(req->waitq, !req->locked);
end(fc, req); end(fc, req);
fuse_put_request(fc, req);
spin_lock(&fc->lock); spin_lock(&fc->lock);
} }
} }

5
fs/fuse/file.c
View File

@ -79,7 +79,6 @@ static void fuse_release_end(struct fuse_conn *fc, struct fuse_req *req)
{ {
dput(req->misc.release.dentry); dput(req->misc.release.dentry);
mntput(req->misc.release.vfsmount); mntput(req->misc.release.vfsmount);
fuse_put_request(fc, req);
} }
static void fuse_file_put(struct fuse_file *ff) static void fuse_file_put(struct fuse_file *ff)
@ -493,7 +492,6 @@ static void fuse_readpages_end(struct fuse_conn *fc, struct fuse_req *req)
} }
if (req->ff) if (req->ff)
fuse_file_put(req->ff); fuse_file_put(req->ff);
fuse_put_request(fc, req);
} }
static void fuse_send_readpages(struct fuse_req *req, struct file *file, static void fuse_send_readpages(struct fuse_req *req, struct file *file,
@ -513,6 +511,7 @@ static void fuse_send_readpages(struct fuse_req *req, struct file *file,
} else { } else {
request_send(fc, req); request_send(fc, req);
fuse_readpages_end(fc, req); fuse_readpages_end(fc, req);
fuse_put_request(fc, req);
} }
} }
@ -1042,7 +1041,6 @@ static void fuse_writepage_free(struct fuse_conn *fc, struct fuse_req *req)
{ {
__free_page(req->pages[0]); __free_page(req->pages[0]);
fuse_file_put(req->ff); fuse_file_put(req->ff);
fuse_put_request(fc, req);
} }
static void fuse_writepage_finish(struct fuse_conn *fc, struct fuse_req *req) static void fuse_writepage_finish(struct fuse_conn *fc, struct fuse_req *req)
@ -1086,6 +1084,7 @@ static void fuse_send_writepage(struct fuse_conn *fc, struct fuse_req *req)
fuse_writepage_finish(fc, req); fuse_writepage_finish(fc, req);
spin_unlock(&fc->lock); spin_unlock(&fc->lock);
fuse_writepage_free(fc, req); fuse_writepage_free(fc, req);
fuse_put_request(fc, req);
spin_lock(&fc->lock); spin_lock(&fc->lock);
} }

1
fs/fuse/inode.c
View File

@ -760,7 +760,6 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req)
fc->max_write = max_t(unsigned, 4096, fc->max_write); fc->max_write = max_t(unsigned, 4096, fc->max_write);
fc->conn_init = 1; fc->conn_init = 1;
} }
fuse_put_request(fc, req);
fc->blocked = 0; fc->blocked = 0;
wake_up_all(&fc->blocked_waitq); wake_up_all(&fc->blocked_waitq);
} }