Commit 4a8ab87b authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by James Bottomley

[SCSI] scsi_error: fix indentation and braces disagreement - add braces

...and the list of recent breakage goes on and on, this time
it's 242f9dcb (block: unify request timeout handling)
which broke it.
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Acked-by: default avatarJens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 66aa5745
...@@ -136,7 +136,7 @@ enum blk_eh_timer_return scsi_times_out(struct request *req) ...@@ -136,7 +136,7 @@ enum blk_eh_timer_return scsi_times_out(struct request *req)
else else
eh_timed_out = NULL; eh_timed_out = NULL;
if (eh_timed_out) if (eh_timed_out) {
rtn = eh_timed_out(scmd); rtn = eh_timed_out(scmd);
switch (rtn) { switch (rtn) {
case BLK_EH_NOT_HANDLED: case BLK_EH_NOT_HANDLED:
...@@ -144,6 +144,7 @@ enum blk_eh_timer_return scsi_times_out(struct request *req) ...@@ -144,6 +144,7 @@ enum blk_eh_timer_return scsi_times_out(struct request *req)
default: default:
return rtn; return rtn;
} }
}
if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) { if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) {
scmd->result |= DID_TIME_OUT << 16; scmd->result |= DID_TIME_OUT << 16;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment