LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jens Axboe <jens.axboe@oracle.com>
To: "Ilpo Järvinen" <ilpo.jarvinen@helsinki.fi>
Cc: James.Bottomley@HansenPartnership.com,
	LKML <linux-kernel@vger.kernel.org>,
	linux-scsi@vger.kernel.org,
	Mike Anderson <andmike@linux.vnet.ibm.com>
Subject: Re: [PATCH] scsierror: fix indentation and braces disagreement - add braces
Date: Fri, 31 Oct 2008 09:03:23 +0100	[thread overview]
Message-ID: <20081031080322.GC31673@kernel.dk> (raw)
In-Reply-To: <Pine.LNX.4.64.0810301259000.7072@wrl-59.cs.helsinki.fi>

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@helsinki.fi>
> Cc: Mike Anderson <andmike@linux.vnet.ibm.com>
> Cc: Jens Axboe <jens.axboe@oracle.com>
> ---
>  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


      reply	other threads:[~2008-10-31  8:05 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-30 11:00 Ilpo Järvinen
2008-10-31  8:03 ` Jens Axboe [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20081031080322.GC31673@kernel.dk \
    --to=jens.axboe@oracle.com \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=andmike@linux.vnet.ibm.com \
    --cc=ilpo.jarvinen@helsinki.fi \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --subject='Re: [PATCH] scsierror: fix indentation and braces disagreement - add braces' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).