Skip to content

Commit

Permalink
[SCSI] scsi_error: fix indentation and braces disagreement - add braces
Browse files Browse the repository at this point in the history
...and the list of recent breakage goes on and on, this time
it's 242f9dc (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>
  • Loading branch information
Ilpo Järvinen authored and James Bottomley committed Dec 29, 2008
1 parent 66aa574 commit 4a8ab87
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/scsi/scsi_error.c
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,15 @@ 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:
break;
default:
return rtn;
}
}

if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) {
scmd->result |= DID_TIME_OUT << 16;
Expand Down

0 comments on commit 4a8ab87

Please sign in to comment.