GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Orangefs: update signal blocking code before Oleg sees it.

Browse source 
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
This commit is contained in:
Mike Marshall 2015-09-29 12:07:46 -04:00
parent 50e01586f4
commit 8c3905adea
3 changed files with 18 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fs/orangefs/waitqueue.c
View file

@ -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 */