summaryrefslogtreecommitdiffstats
path: root/fs/fuse/inode.c
diff options
context:
space:
mode:
authorMaxim Patlasov <mpatlasov@parallels.com>2013-03-21 15:02:28 +0100
committerMiklos Szeredi <mszeredi@suse.cz>2013-04-17 12:31:45 +0200
commit0aada88476a33690c9569b094191ce92a38e6541 (patch)
tree4aef3365654d4751154dc825731af721661fcef2 /fs/fuse/inode.c
parentfuse: add flag fc->initialized (diff)
downloadlinux-0aada88476a33690c9569b094191ce92a38e6541.tar.xz
linux-0aada88476a33690c9569b094191ce92a38e6541.zip
fuse: skip blocking on allocations of synchronous requests
A task may have at most one synchronous request allocated. So these requests need not be otherwise limited. The patch re-works fuse_get_req() to follow this idea. Signed-off-by: Maxim Patlasov <mpatlasov@parallels.com> Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Diffstat (limited to 'fs/fuse/inode.c')
-rw-r--r--fs/fuse/inode.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 4958f8099f16..17ec1f70524d 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -583,7 +583,7 @@ void fuse_conn_init(struct fuse_conn *fc)
fc->khctr = 0;
fc->polled_files = RB_ROOT;
fc->reqctr = 0;
- fc->blocked = 1;
+ fc->blocked = 0;
fc->initialized = 0;
fc->attr_version = 1;
get_random_bytes(&fc->scramble_key, sizeof(fc->scramble_key));
@@ -883,7 +883,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->conn_init = 1;
}
- fc->blocked = 0;
fc->initialized = 1;
wake_up_all(&fc->blocked_waitq);
}