diff options
author | Maxim Patlasov <mpatlasov@parallels.com> | 2013-03-21 10:02:15 -0400 |
---|---|---|
committer | Miklos Szeredi <mszeredi@suse.cz> | 2013-04-17 06:31:44 -0400 |
commit | 796523fb24028639c007f71e02ca21730f7c0af6 (patch) | |
tree | c898b0bd8933078bdb16bd1c35a4a1cd7d074a06 /fs/fuse/inode.c | |
parent | 8b41e6715ed555e2d8e8dac52ec1f05a9f04dcb4 (diff) |
fuse: add flag fc->initialized
Existing flag fc->blocked is used to suspend request allocation both in case
of many background request submitted and period of time before init_reply
arrives from userspace. Next patch will skip blocking allocations of
synchronous request (disregarding fc->blocked). This is mostly OK, but
we still need to suspend allocations if init_reply is not arrived yet. The
patch introduces flag fc->initialized which will serve this purpose.
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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index e26607df93df..4958f8099f16 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c | |||
@@ -363,6 +363,7 @@ void fuse_conn_kill(struct fuse_conn *fc) | |||
363 | spin_lock(&fc->lock); | 363 | spin_lock(&fc->lock); |
364 | fc->connected = 0; | 364 | fc->connected = 0; |
365 | fc->blocked = 0; | 365 | fc->blocked = 0; |
366 | fc->initialized = 1; | ||
366 | spin_unlock(&fc->lock); | 367 | spin_unlock(&fc->lock); |
367 | /* Flush all readers on this fs */ | 368 | /* Flush all readers on this fs */ |
368 | kill_fasync(&fc->fasync, SIGIO, POLL_IN); | 369 | kill_fasync(&fc->fasync, SIGIO, POLL_IN); |
@@ -583,6 +584,7 @@ void fuse_conn_init(struct fuse_conn *fc) | |||
583 | fc->polled_files = RB_ROOT; | 584 | fc->polled_files = RB_ROOT; |
584 | fc->reqctr = 0; | 585 | fc->reqctr = 0; |
585 | fc->blocked = 1; | 586 | fc->blocked = 1; |
587 | fc->initialized = 0; | ||
586 | fc->attr_version = 1; | 588 | fc->attr_version = 1; |
587 | get_random_bytes(&fc->scramble_key, sizeof(fc->scramble_key)); | 589 | get_random_bytes(&fc->scramble_key, sizeof(fc->scramble_key)); |
588 | } | 590 | } |
@@ -882,6 +884,7 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req) | |||
882 | fc->conn_init = 1; | 884 | fc->conn_init = 1; |
883 | } | 885 | } |
884 | fc->blocked = 0; | 886 | fc->blocked = 0; |
887 | fc->initialized = 1; | ||
885 | wake_up_all(&fc->blocked_waitq); | 888 | wake_up_all(&fc->blocked_waitq); |
886 | } | 889 | } |
887 | 890 | ||