projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 00e5a55c BS |
1 | Subject: scsi_error: fix indentation and braces disagreement - add braces |
| 2 | From: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | |
| 3 | Date: Fri Nov 7 11:18:27 2008 -0600: | |
| 4 | Git: 6ec39f02cf48df89c3cbab4aeef521569fec00e4 | |
| 5 | ||
| 6 | ...and the list of recent breakage goes on and on, this time | |
| 7 | it's 242f9dcb8ba6f (block: unify request timeout handling) | |
| 8 | which broke it. | |
| 9 | ||
| 10 | Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | |
| 11 | Acked-by: Jens Axboe <jens.axboe@oracle.com> | |
| 12 | Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com> | |
| 13 | Signed-off-by: Hannes Reinecke <hare@suse.de> | |
| 14 | ||
| 15 | --- | |
| 16 | drivers/scsi/scsi_error.c | 3 ++- | |
| 17 | 1 file changed, 2 insertions(+), 1 deletion(-) | |
| 18 | ||
| 19 | --- a/drivers/scsi/scsi_error.c | |
| 20 | +++ b/drivers/scsi/scsi_error.c | |
| 21 | @@ -139,7 +139,7 @@ enum blk_eh_timer_return scsi_times_out( | |
| 22 | else | |
| 23 | eh_timed_out = NULL; | |
| 24 | ||
| 25 | - if (eh_timed_out) | |
| 26 | + if (eh_timed_out) { | |
| 27 | rtn = eh_timed_out(scmd); | |
| 28 | switch (rtn) { | |
| 29 | case BLK_EH_NOT_HANDLED: | |
| 30 | @@ -147,6 +147,7 @@ enum blk_eh_timer_return scsi_times_out( | |
| 31 | default: | |
| 32 | return rtn; | |
| 33 | } | |
| 34 | + } | |
| 35 | ||
| 36 | if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) { | |
| 37 | scmd->result |= DID_TIME_OUT << 16; |