On Thu, Oct 30 2008, Ilpo Järvinen wrote: > > ...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@xxxxxxxxxxx> > Cc: Mike Anderson <andmike@xxxxxxxxxxxxxxxxxx> > Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> > --- > 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 94ed262..a6b107c 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) > 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; > -- > 1.5.2.2 James, will you queue this up? The missing braces are harmless as it stands, but the patch is correct :-) -- Jens Axboe -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html