diff options
| author | Mike Marshall <hubcap@omnibond.com> | 2015-09-29 18:07:46 +0200 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2015-10-03 17:44:36 +0200 |
| commit | 8c3905adea92c79e32b02120c724dfd4cf84dd85 (patch) | |
| tree | 0ecfd4f18ba189eacb81760beee842d97467dd97 /fs/orangefs/waitqueue.c | |
| parent | Orangefs: Don't opencode memcpy. (diff) | |
| download | linux-8c3905adea92c79e32b02120c724dfd4cf84dd85.tar.xz linux-8c3905adea92c79e32b02120c724dfd4cf84dd85.zip | |
Orangefs: update signal blocking code before Oleg sees it.
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs/orangefs/waitqueue.c')
| -rw-r--r-- | fs/orangefs/waitqueue.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/orangefs/waitqueue.c b/fs/orangefs/waitqueue.c index ad79e534dc8e..d7b0eba043ab 100644 --- a/fs/orangefs/waitqueue.c +++ b/fs/orangefs/waitqueue.c @@ -80,7 +80,7 @@ retry_servicing: /* mask out signals if this operation is not to be interrupted */ if (!(flags & PVFS2_OP_INTERRUPTIBLE)) - mask_blocked_signals(&orig_sigset); + block_signals(&orig_sigset); if (!(flags & PVFS2_OP_NO_SEMAPHORE)) { ret = mutex_lock_interruptible(&request_mutex); @@ -90,7 +90,7 @@ retry_servicing: */ if (ret < 0) { if (!(flags & PVFS2_OP_INTERRUPTIBLE)) - unmask_blocked_signals(&orig_sigset); + set_signals(&orig_sigset); op->downcall.status = ret; gossip_debug(GOSSIP_WAIT_DEBUG, "pvfs2: service_operation interrupted.\n"); @@ -160,7 +160,7 @@ retry_servicing: } if (!(flags & PVFS2_OP_INTERRUPTIBLE)) - unmask_blocked_signals(&orig_sigset); + set_signals(&orig_sigset); BUG_ON(ret != op->downcall.status); /* retry if operation has not been serviced and if requested */ |