LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] scsierror: fix indentation and braces disagreement - add braces
@ 2008-10-30 11:00 Ilpo Järvinen
  2008-10-31  8:03 ` Jens Axboe
  0 siblings, 1 reply; 2+ messages in thread
From: Ilpo Järvinen @ 2008-10-30 11:00 UTC (permalink / raw)
  To: James.Bottomley, Jens Axboe; +Cc: LKML, linux-scsi, Mike Anderson

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1000 bytes --]


...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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] scsierror: fix indentation and braces disagreement - add braces
  2008-10-30 11:00 [PATCH] scsierror: fix indentation and braces disagreement - add braces Ilpo Järvinen
@ 2008-10-31  8:03 ` Jens Axboe
  0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2008-10-31  8:03 UTC (permalink / raw)
  To: Ilpo Järvinen; +Cc: James.Bottomley, LKML, linux-scsi, Mike Anderson

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


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-10-31  8:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-10-30 11:00 [PATCH] scsierror: fix indentation and braces disagreement - add braces Ilpo Järvinen
2008-10-31  8:03 ` Jens Axboe

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).