diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-07-19 03:08:27 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-07-19 03:08:27 -0400 |
| commit | 7d3a07fcb8a0d5c06718de14fb91fdf1ef20a0e2 (patch) | |
| tree | 7743a5fb3644c918c94a4bdfcddeba5bcb6a67bf /fs/fuse/dev.c | |
| parent | 6a0fb306738994d6f091791aeb11a5dc87ad8f4c (diff) | |
| download | linux-stable-7d3a07fcb8a0d5c06718de14fb91fdf1ef20a0e2.tar.gz linux-stable-7d3a07fcb8a0d5c06718de14fb91fdf1ef20a0e2.tar.bz2 linux-stable-7d3a07fcb8a0d5c06718de14fb91fdf1ef20a0e2.zip | |
fuse: don't mess with blocking signals
just use wait_event_killable{,_exclusive}().
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/fuse/dev.c')
| -rw-r--r-- | fs/fuse/dev.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index cbece1221417..9406f35d1a1e 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -99,19 +99,6 @@ void fuse_request_free(struct fuse_req *req) kmem_cache_free(fuse_req_cachep, req); } -static void block_sigs(sigset_t *oldset) -{ - sigset_t mask; - - siginitsetinv(&mask, sigmask(SIGKILL)); - sigprocmask(SIG_BLOCK, &mask, oldset); -} - -static void restore_sigs(sigset_t *oldset) -{ - sigprocmask(SIG_SETMASK, oldset, NULL); -} - void __fuse_get_request(struct fuse_req *req) { atomic_inc(&req->count); @@ -151,15 +138,9 @@ static struct fuse_req *__fuse_get_req(struct fuse_conn *fc, unsigned npages, atomic_inc(&fc->num_waiting); if (fuse_block_alloc(fc, for_background)) { - sigset_t oldset; - int intr; - - block_sigs(&oldset); - intr = wait_event_interruptible_exclusive(fc->blocked_waitq, - !fuse_block_alloc(fc, for_background)); - restore_sigs(&oldset); err = -EINTR; - if (intr) + if (wait_event_killable_exclusive(fc->blocked_waitq, + !fuse_block_alloc(fc, for_background))) goto out; } /* Matches smp_wmb() in fuse_set_initialized() */ @@ -446,14 +427,9 @@ static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req) } if (!test_bit(FR_FORCE, &req->flags)) { - sigset_t oldset; - /* Only fatal signals may interrupt this */ - block_sigs(&oldset); - err = wait_event_interruptible(req->waitq, + err = wait_event_killable(req->waitq, test_bit(FR_FINISHED, &req->flags)); - restore_sigs(&oldset); - if (!err) return; |