From: Andrew Morton <akpm@osdl.org>
To: Adrian Bunk <bunk@fs.tum.de>
Cc: patmans@ibm.com, neuffer@goofy.zdv.uni-mainz.de,
a.arnold@kfa-juelich.de, linux-kernel@vger.kernel.org,
James.Bottomley@SteelEye.com, linux-scsi@vger.kernel.org
Subject: Re: 2.6.1-rc1: SCSI: `TIMEOUT' redefined
Date: Tue, 6 Jan 2004 14:40:59 -0800 [thread overview]
Message-ID: <20040106144059.0c896eea.akpm@osdl.org> (raw)
In-Reply-To: <20040106183325.GJ11523@fs.tum.de>
Adrian Bunk <bunk@fs.tum.de> wrote:
>
> On Wed, Dec 31, 2003 at 12:36:49AM -0800, Linus Torvalds wrote:
> >...
> > Summary of changes from v2.6.0 to v2.6.1-rc1
> > ============================================
> >...
> > Patrick Mansfield:
> > o consolidate and log scsi command on send and completion
> >...
>
> This adds a #define TIMEOUT to scsi.h conflicting with a different
> TIMEOUT #define in drivers/scsi/eata_generic.h:
eww, bad idea. I count more than twenty #defines of TIMEOUT in the kernel
tree.
We should change scsi.h - "TIMEOUT" is waaay too collision-prone.
In fact, a lot of those identifiers are quite poorly chosen:
#define NEEDS_RETRY 0x2001
#define SUCCESS 0x2002
#define FAILED 0x2003
#define QUEUED 0x2004
#define SOFT_ERROR 0x2005
#define ADD_TO_MLQUEUE 0x2006
#define TIMEOUT 0x2007
That's just asking for it.
This untested patch purports to fix just the TIMEOUT thing:
(hmm, SD_TIMEOUT is already taken, too).
diff -puN drivers/scsi/scsi.c~scsi-rename-TIMEOUT drivers/scsi/scsi.c
--- 25/drivers/scsi/scsi.c~scsi-rename-TIMEOUT Tue Jan 6 14:37:24 2004
+++ 25-akpm/drivers/scsi/scsi.c Tue Jan 6 14:37:35 2004
@@ -441,7 +441,7 @@ void scsi_log_completion(struct scsi_cmn
case FAILED:
printk("FAILED ");
break;
- case TIMEOUT:
+ case SD_CMD_TIMEOUT:
/*
* If called via scsi_times_out.
*/
diff -puN drivers/scsi/scsi_error.c~scsi-rename-TIMEOUT drivers/scsi/scsi_error.c
--- 25/drivers/scsi/scsi_error.c~scsi-rename-TIMEOUT Tue Jan 6 14:37:24 2004
+++ 25-akpm/drivers/scsi/scsi_error.c Tue Jan 6 14:37:45 2004
@@ -164,7 +164,7 @@ int scsi_delete_timer(struct scsi_cmnd *
**/
void scsi_times_out(struct scsi_cmnd *scmd)
{
- scsi_log_completion(scmd, TIMEOUT);
+ scsi_log_completion(scmd, SD_CMD_TIMEOUT);
if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) {
panic("Error handler thread not present at %p %p %s %d",
scmd, scmd->device->host, __FILE__, __LINE__);
diff -puN include/scsi/scsi.h~scsi-rename-TIMEOUT include/scsi/scsi.h
--- 25/include/scsi/scsi.h~scsi-rename-TIMEOUT Tue Jan 6 14:37:24 2004
+++ 25-akpm/include/scsi/scsi.h Tue Jan 6 14:37:54 2004
@@ -302,7 +302,7 @@ struct scsi_lun {
#define QUEUED 0x2004
#define SOFT_ERROR 0x2005
#define ADD_TO_MLQUEUE 0x2006
-#define TIMEOUT 0x2007
+#define SD_CMD_TIMEOUT 0x2007
/*
* Midlevel queue return values.
_
prev parent reply other threads:[~2004-01-06 22:40 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-12-31 8:36 2.6.1-rc1 Linus Torvalds
2003-12-31 8:47 ` 2.6.1-rc1 Mike Fedyk
2003-12-31 10:05 ` 2.6.1-rc1 Tomas Szepe
2003-12-31 12:12 ` 2.6.1-rc1 Jeff Garzik
2003-12-31 15:00 ` 2.6.1-rc1 [resend] Paolo Ornati
2003-12-31 15:06 ` William Lee Irwin III
2003-12-31 15:19 ` Paolo Ornati
2003-12-31 15:20 ` William Lee Irwin III
2003-12-31 15:45 ` Paolo Ornati
2003-12-31 16:31 ` Ed Sweetman
2003-12-31 18:03 ` Paolo Ornati
2004-01-01 9:12 ` 2.6.1-rc1 Andreas Unterkircher
2004-01-01 18:12 ` 2.6.1-rc1 Paolo Ornati
2004-01-02 4:51 ` 2.6.1-rc1 with JP106 keyboard Go Taniguchi
2004-01-02 5:46 ` Go Taniguchi
2004-01-02 13:20 ` Vojtech Pavlik
2004-01-02 13:17 ` Vojtech Pavlik
2004-01-02 19:01 ` Go Taniguchi
2004-01-02 20:10 ` Vojtech Pavlik
2004-01-03 5:54 ` Go Taniguchi
2004-01-06 18:33 ` 2.6.1-rc1: SCSI: `TIMEOUT' redefined Adrian Bunk
2004-01-06 22:40 ` [PATCH] " Patrick Mansfield
2004-01-06 22:40 ` Andrew Morton [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=20040106144059.0c896eea.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=James.Bottomley@SteelEye.com \
--cc=a.arnold@kfa-juelich.de \
--cc=bunk@fs.tum.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=neuffer@goofy.zdv.uni-mainz.de \
--cc=patmans@ibm.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.