summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>2008-10-30 13:00:57 +0200
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-12-29 11:24:14 -0600
commit4a8ab87baf8d424de99234fdfae35db6a414ffd2 (patch)
tree144a6c03dfa5a045bc45e99674397782fc87c212 /drivers/scsi
parent66aa5745f6fe328f0166f91b523df864b17fb8f1 (diff)
downloadop-kernel-dev-4a8ab87baf8d424de99234fdfae35db6a414ffd2.zip
op-kernel-dev-4a8ab87baf8d424de99234fdfae35db6a414ffd2.tar.gz
[SCSI] scsi_error: fix indentation and braces disagreement - add braces
...and the list of recent breakage goes on and on, this time it's 242f9dcb8ba6f (block: unify request timeout handling) which broke it. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Acked-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/scsi_error.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index edfaf24..f5767dc 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -136,7 +136,7 @@ enum blk_eh_timer_return scsi_times_out(struct request *req)
else
eh_timed_out = NULL;
- if (eh_timed_out)
+ if (eh_timed_out) {
rtn = eh_timed_out(scmd);
switch (rtn) {
case BLK_EH_NOT_HANDLED:
@@ -144,6 +144,7 @@ enum blk_eh_timer_return scsi_times_out(struct request *req)
default:
return rtn;
}
+ }
if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) {
scmd->result |= DID_TIME_OUT << 16;
OpenPOWER on IntegriCloud