diff options
| author | Ilpo Järvinen | 2008-10-30 12:00:57 +0100 |
|---|---|---|
| committer | James Bottomley | 2008-12-29 18:24:14 +0100 |
| commit | 4a8ab87baf8d424de99234fdfae35db6a414ffd2 (patch) | |
| tree | 144a6c03dfa5a045bc45e99674397782fc87c212 /drivers | |
| parent | [SCSI] tmscsim: fix indentation and braces disagreement - add braces (diff) | |
| download | kernel-qcow2-linux-4a8ab87baf8d424de99234fdfae35db6a414ffd2.tar.gz kernel-qcow2-linux-4a8ab87baf8d424de99234fdfae35db6a414ffd2.tar.xz kernel-qcow2-linux-4a8ab87baf8d424de99234fdfae35db6a414ffd2.zip | |
[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')
| -rw-r--r-- | drivers/scsi/scsi_error.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index edfaf241c5ba..f5767dc48d61 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; |