Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753208AbYJaIFN (ORCPT ); Fri, 31 Oct 2008 04:05:13 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752798AbYJaIEk (ORCPT ); Fri, 31 Oct 2008 04:04:40 -0400 Received: from pasmtpa.tele.dk ([80.160.77.114]:40737 "EHLO pasmtpA.tele.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752649AbYJaIEg (ORCPT ); Fri, 31 Oct 2008 04:04:36 -0400 Date: Fri, 31 Oct 2008 09:03:23 +0100 From: Jens Axboe To: Ilpo =?iso-8859-1?Q?J=E4rvinen?= Cc: James.Bottomley@HansenPartnership.com, LKML , linux-scsi@vger.kernel.org, Mike Anderson Subject: Re: [PATCH] scsierror: fix indentation and braces disagreement - add braces Message-ID: <20081031080322.GC31673@kernel.dk> References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1478 Lines: 48 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 > Cc: Mike Anderson > Cc: Jens Axboe > --- > 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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/