Commit 4a8ab87b authored Oct 30, 2008 by Ilpo Järvinen Committed by James Bottomley Dec 29, 2008

[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: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent 66aa5745

drivers/scsi/scsi_error.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;