diff options
author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2008-10-30 07:00:57 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-12-29 12:24:14 -0500 |
commit | 4a8ab87baf8d424de99234fdfae35db6a414ffd2 (patch) | |
tree | 144a6c03dfa5a045bc45e99674397782fc87c212 /drivers/scsi | |
parent | 66aa5745f6fe328f0166f91b523df864b17fb8f1 (diff) |
[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.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) | |||
136 | else | 136 | else |
137 | eh_timed_out = NULL; | 137 | eh_timed_out = NULL; |
138 | 138 | ||
139 | if (eh_timed_out) | 139 | if (eh_timed_out) { |
140 | rtn = eh_timed_out(scmd); | 140 | rtn = eh_timed_out(scmd); |
141 | switch (rtn) { | 141 | switch (rtn) { |
142 | case BLK_EH_NOT_HANDLED: | 142 | case BLK_EH_NOT_HANDLED: |
@@ -144,6 +144,7 @@ enum blk_eh_timer_return scsi_times_out(struct request *req) | |||
144 | default: | 144 | default: |
145 | return rtn; | 145 | return rtn; |
146 | } | 146 | } |
147 | } | ||
147 | 148 | ||
148 | if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) { | 149 | if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) { |
149 | scmd->result |= DID_TIME_OUT << 16; | 150 | scmd->result |= DID_TIME_OUT << 16; |