* [patch 01/17] aacraid: rename check_reset
@ 2007-07-09 18:59 akpm
2007-07-09 19:04 ` Salyzyn, Mark
0 siblings, 1 reply; 3+ messages in thread
From: akpm @ 2007-07-09 18:59 UTC (permalink / raw)
Cc: linux-scsi, akpm, James.Bottomley, aacraid
From: Andrew Morton <akpm@linux-foundation.org>
Too generic, clashes with ISDN.
Cc: Mark Salyzyn <aacraid@adaptec.com>
Cc: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/scsi/aacraid/aachba.c | 8 ++++----
drivers/scsi/aacraid/aacraid.h | 2 +-
drivers/scsi/aacraid/commsup.c | 5 +++--
3 files changed, 8 insertions(+), 7 deletions(-)
diff -puN drivers/scsi/aacraid/aachba.c~aacraid-rename-check_reset drivers/scsi/aacraid/aachba.c
--- a/drivers/scsi/aacraid/aachba.c~aacraid-rename-check_reset
+++ a/drivers/scsi/aacraid/aachba.c
@@ -177,9 +177,9 @@ int check_interval = 24 * 60 * 60;
module_param(check_interval, int, S_IRUGO|S_IWUSR);
MODULE_PARM_DESC(check_interval, "Interval in seconds between adapter health checks.");
-int check_reset = 1;
-module_param(check_reset, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(check_reset, "If adapter fails health check, reset the adapter.");
+int aacraid_check_reset = 1;
+module_param_named(check_reset, aacraid_check_reset, int, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(aacraid_check_reset, "If adapter fails health check, reset the adapter.");
int expose_physicals = -1;
module_param(expose_physicals, int, S_IRUGO|S_IWUSR);
@@ -1211,7 +1211,7 @@ int aac_get_adapter_info(struct aac_dev*
(int)sizeof(dev->supplement_adapter_info.VpdInfo.Tsid),
dev->supplement_adapter_info.VpdInfo.Tsid);
}
- if (!check_reset ||
+ if (!aacraid_check_reset ||
(dev->supplement_adapter_info.SupportedOptions2 &
le32_to_cpu(AAC_OPTION_IGNORE_RESET))) {
printk(KERN_INFO "%s%d: Reset Adapter Ignored\n",
diff -puN drivers/scsi/aacraid/aacraid.h~aacraid-rename-check_reset drivers/scsi/aacraid/aacraid.h
--- a/drivers/scsi/aacraid/aacraid.h~aacraid-rename-check_reset
+++ a/drivers/scsi/aacraid/aacraid.h
@@ -1857,4 +1857,4 @@ extern int aac_reset_devices;
extern int aac_commit;
extern int update_interval;
extern int check_interval;
-extern int check_reset;
+extern int aacraid_check_reset;
diff -puN drivers/scsi/aacraid/commsup.c~aacraid-rename-check_reset drivers/scsi/aacraid/commsup.c
--- a/drivers/scsi/aacraid/commsup.c~aacraid-rename-check_reset
+++ a/drivers/scsi/aacraid/commsup.c
@@ -1370,8 +1370,9 @@ int aac_check_health(struct aac_dev * aa
printk(KERN_ERR "%s: Host adapter BLINK LED 0x%x\n", aac->name, BlinkLED);
- if (!check_reset || (aac->supplement_adapter_info.SupportedOptions2 &
- le32_to_cpu(AAC_OPTION_IGNORE_RESET)))
+ if (!aacraid_check_reset ||
+ (aac->supplement_adapter_info.SupportedOptions2 &
+ le32_to_cpu(AAC_OPTION_IGNORE_RESET)))
goto out;
host = aac->scsi_host_ptr;
if (aac->thread->pid != current->pid)
_
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [patch 01/17] aacraid: rename check_reset
2007-07-09 18:59 [patch 01/17] aacraid: rename check_reset akpm
@ 2007-07-09 19:04 ` Salyzyn, Mark
2007-07-09 20:14 ` Andrew Morton
0 siblings, 1 reply; 3+ messages in thread
From: Salyzyn, Mark @ 2007-07-09 19:04 UTC (permalink / raw)
To: akpm; +Cc: linux-scsi, James.Bottomley, AACRAID
ACK (well, I'd prefer aac_check_reset over aacraid_check_reset, but no
matter).
Sincerely -- Mark Salyzyn
> -----Original Message-----
> From: akpm@linux-foundation.org [mailto:akpm@linux-foundation.org]
> Sent: Monday, July 09, 2007 3:00 PM
> To: James.Bottomley@steeleye.com
> Cc: linux-scsi@vger.kernel.org; akpm@linux-foundation.org;
> James.Bottomley@steeleye.com; AACRAID
> Subject: [patch 01/17] aacraid: rename check_reset
>
>
> From: Andrew Morton <akpm@linux-foundation.org>
>
> Too generic, clashes with ISDN.
>
> Cc: Mark Salyzyn <aacraid@adaptec.com>
> Cc: James Bottomley <James.Bottomley@SteelEye.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
>
> drivers/scsi/aacraid/aachba.c | 8 ++++----
> drivers/scsi/aacraid/aacraid.h | 2 +-
> drivers/scsi/aacraid/commsup.c | 5 +++--
> 3 files changed, 8 insertions(+), 7 deletions(-)
>
> diff -puN
> drivers/scsi/aacraid/aachba.c~aacraid-rename-check_reset
> drivers/scsi/aacraid/aachba.c
> --- a/drivers/scsi/aacraid/aachba.c~aacraid-rename-check_reset
> +++ a/drivers/scsi/aacraid/aachba.c
> @@ -177,9 +177,9 @@ int check_interval = 24 * 60 * 60;
> module_param(check_interval, int, S_IRUGO|S_IWUSR);
> MODULE_PARM_DESC(check_interval, "Interval in seconds
> between adapter health checks.");
>
> -int check_reset = 1;
> -module_param(check_reset, int, S_IRUGO|S_IWUSR);
> -MODULE_PARM_DESC(check_reset, "If adapter fails health
> check, reset the adapter.");
> +int aacraid_check_reset = 1;
> +module_param_named(check_reset, aacraid_check_reset, int,
> S_IRUGO|S_IWUSR);
> +MODULE_PARM_DESC(aacraid_check_reset, "If adapter fails
> health check, reset the adapter.");
>
> int expose_physicals = -1;
> module_param(expose_physicals, int, S_IRUGO|S_IWUSR);
> @@ -1211,7 +1211,7 @@ int aac_get_adapter_info(struct aac_dev*
>
> (int)sizeof(dev->supplement_adapter_info.VpdInfo.Tsid),
> dev->supplement_adapter_info.VpdInfo.Tsid);
> }
> - if (!check_reset ||
> + if (!aacraid_check_reset ||
> (dev->supplement_adapter_info.SupportedOptions2 &
> le32_to_cpu(AAC_OPTION_IGNORE_RESET))) {
> printk(KERN_INFO "%s%d: Reset Adapter
> Ignored\n",
> diff -puN
> drivers/scsi/aacraid/aacraid.h~aacraid-rename-check_reset
> drivers/scsi/aacraid/aacraid.h
> --- a/drivers/scsi/aacraid/aacraid.h~aacraid-rename-check_reset
> +++ a/drivers/scsi/aacraid/aacraid.h
> @@ -1857,4 +1857,4 @@ extern int aac_reset_devices;
> extern int aac_commit;
> extern int update_interval;
> extern int check_interval;
> -extern int check_reset;
> +extern int aacraid_check_reset;
> diff -puN
> drivers/scsi/aacraid/commsup.c~aacraid-rename-check_reset
> drivers/scsi/aacraid/commsup.c
> --- a/drivers/scsi/aacraid/commsup.c~aacraid-rename-check_reset
> +++ a/drivers/scsi/aacraid/commsup.c
> @@ -1370,8 +1370,9 @@ int aac_check_health(struct aac_dev * aa
>
> printk(KERN_ERR "%s: Host adapter BLINK LED 0x%x\n",
> aac->name, BlinkLED);
>
> - if (!check_reset ||
> (aac->supplement_adapter_info.SupportedOptions2 &
> - le32_to_cpu(AAC_OPTION_IGNORE_RESET)))
> + if (!aacraid_check_reset ||
> + (aac->supplement_adapter_info.SupportedOptions2 &
> + le32_to_cpu(AAC_OPTION_IGNORE_RESET)))
> goto out;
> host = aac->scsi_host_ptr;
> if (aac->thread->pid != current->pid)
> _
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 01/17] aacraid: rename check_reset
2007-07-09 19:04 ` Salyzyn, Mark
@ 2007-07-09 20:14 ` Andrew Morton
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Morton @ 2007-07-09 20:14 UTC (permalink / raw)
To: Salyzyn, Mark; +Cc: James.Bottomley, linux-scsi, AACRAID
On Mon, 9 Jul 2007 15:04:42 -0400
"Salyzyn, Mark" <mark_salyzyn@adaptec.com> wrote:
> ACK
Thanks.
> (well, I'd prefer aac_check_reset over aacraid_check_reset, but no
> matter).
Will fix and resend.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-07-09 20:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-09 18:59 [patch 01/17] aacraid: rename check_reset akpm
2007-07-09 19:04 ` Salyzyn, Mark
2007-07-09 20:14 ` Andrew Morton
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).