iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

orangefs: reduce nesting in wait_for_matching_downcall()

Browse Source 
reorder if branches...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
This commit is contained in:
Al Viro 2016-01-23 13:04:19 -05:00 committed by Mike Marshall
parent e1056a9cc3
commit 70c6ea26ff
1 changed files with 59 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
fs/orangefs/waitqueue.c
View File

@ -376,79 +376,77 @@ static int wait_for_matching_downcall(struct orangefs_kernel_op_s *op)
} }
spin_unlock(&op->lock); spin_unlock(&op->lock);
if (!signal_pending(current)) { if (unlikely(signal_pending(current))) {
gossip_debug(GOSSIP_WAIT_DEBUG,
"*** %s:"
" operation interrupted by a signal (tag "
"%llu, op %p)\n",
__func__,
llu(op->tag),
op);
orangefs_clean_up_interrupted_operation(op);
ret = -EINTR;
break;
}
/*
* if this was our first attempt and client-core
* has not purged our operation, we are happy to
* simply wait
*/
spin_lock(&op->lock);
if (op->attempts == 0 && !op_state_purged(op)) {
spin_unlock(&op->lock);
schedule();
} else {
spin_unlock(&op->lock);
/* /*
* if this was our first attempt and client-core * subsequent attempts, we retry exactly once
* has not purged our operation, we are happy to * with timeouts
* simply wait
*/ */
spin_lock(&op->lock); if (!schedule_timeout(MSECS_TO_JIFFIES
if (op->attempts == 0 && !op_state_purged(op)) { (1000 * op_timeout_secs))) {
spin_unlock(&op->lock);
schedule();
} else {
spin_unlock(&op->lock);
/*
* subsequent attempts, we retry exactly once
* with timeouts
*/
if (!schedule_timeout(MSECS_TO_JIFFIES
(1000 * op_timeout_secs))) {
gossip_debug(GOSSIP_WAIT_DEBUG,
"*** %s:"
" operation timed out (tag"
" %llu, %p, att %d)\n",
__func__,
llu(op->tag),
op,
op->attempts);
ret = -ETIMEDOUT;
orangefs_clean_up_interrupted_operation
(op);
break;
}
}
spin_lock(&op->lock);
op->attempts++;
/*
* if the operation was purged in the meantime, it
* is better to requeue it afresh but ensure that
* we have not been purged repeatedly. This could
* happen if client-core crashes when an op
* is being serviced, so we requeue the op, client
* core crashes again so we requeue the op, client
* core starts, and so on...
*/
if (op_state_purged(op)) {
ret = (op->attempts < ORANGEFS_PURGE_RETRY_COUNT) ?
-EAGAIN :
-EIO;
spin_unlock(&op->lock);
gossip_debug(GOSSIP_WAIT_DEBUG, gossip_debug(GOSSIP_WAIT_DEBUG,
"*** %s:" "*** %s:"
" operation purged (tag " " operation timed out (tag"
"%llu, %p, att %d)\n", " %llu, %p, att %d)\n",
__func__, __func__,
llu(op->tag), llu(op->tag),
op, op,
op->attempts); op->attempts);
ret = -ETIMEDOUT;
orangefs_clean_up_interrupted_operation(op); orangefs_clean_up_interrupted_operation(op);
break; break;
} }
spin_unlock(&op->lock);
continue;
} }
spin_lock(&op->lock);
gossip_debug(GOSSIP_WAIT_DEBUG, op->attempts++;
"*** %s:" /*
" operation interrupted by a signal (tag " * if the operation was purged in the meantime, it
"%llu, op %p)\n", * is better to requeue it afresh but ensure that
__func__, * we have not been purged repeatedly. This could
llu(op->tag), * happen if client-core crashes when an op
op); * is being serviced, so we requeue the op, client
orangefs_clean_up_interrupted_operation(op); * core crashes again so we requeue the op, client
ret = -EINTR; * core starts, and so on...
break; */
if (op_state_purged(op)) {
ret = (op->attempts < ORANGEFS_PURGE_RETRY_COUNT) ?
-EAGAIN :
-EIO;
spin_unlock(&op->lock);
gossip_debug(GOSSIP_WAIT_DEBUG,
"*** %s:"
" operation purged (tag "
"%llu, %p, att %d)\n",
__func__,
llu(op->tag),
op,
op->attempts);
orangefs_clean_up_interrupted_operation(op);
break;
}
spin_unlock(&op->lock);
} }
spin_lock(&op->lock); spin_lock(&op->lock);