2006-10-10 23:16:38

by Jeff Garzik

Subject: [PATCH] MD: conditionalize some code

The autorun code is only used if this module is built into the static
kernel image. Adjust #ifdefs accordingly.

Signed-off-by: Jeff Garzik <[email protected]>

---

drivers/md/md.c | 4 +++-

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 57fa64f..c75cdf9 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3368,6 +3368,7 @@ out:
return err;
}

+#ifndef MODULE
static void autorun_array(mddev_t *mddev)
{
mdk_rdev_t *rdev;
@@ -3482,6 +3483,7 @@ static void autorun_devices(int part)
}
printk(KERN_INFO "md: ... autorun DONE.\n");
}
+#endif /* !MODULE */

static int get_version(void __user * arg)
{
@@ -5592,7 +5594,7 @@ static void autostart_arrays(int part)
autorun_devices(part);
}

-#endif
+#endif /* !MODULE */

static __exit void md_exit(void)
{

2006-10-10 23:53:18

by NeilBrown

Subject: Re: [PATCH] MD: conditionalize some code

On Tuesday October 10, [email protected] wrote:
>
> The autorun code is only used if this module is built into the static
> kernel image. Adjust #ifdefs accordingly.
>
> Signed-off-by: Jeff Garzik <[email protected]>

Acked-by: NeilBrown <[email protected]>

Thanks,
NeilBrown

>
> ---
>
> drivers/md/md.c | 4 +++-
>
> diff --git a/drivers/md/md.c b/drivers/md/md.c
> index 57fa64f..c75cdf9 100644
> --- a/drivers/md/md.c
> +++ b/drivers/md/md.c
> @@ -3368,6 +3368,7 @@ out:
> return err;
> }
>
> +#ifndef MODULE
> static void autorun_array(mddev_t *mddev)
> {
> mdk_rdev_t *rdev;
> @@ -3482,6 +3483,7 @@ static void autorun_devices(int part)
> }
> printk(KERN_INFO "md: ... autorun DONE.\n");
> }
> +#endif /* !MODULE */
>
> static int get_version(void __user * arg)
> {
> @@ -5592,7 +5594,7 @@ static void autostart_arrays(int part)
> autorun_devices(part);
> }
>
> -#endif
> +#endif /* !MODULE */
>
> static __exit void md_exit(void)
> {

2006-10-11 15:46:56

by Steve Hindle

Subject: Re: [PATCH] MD: conditionalize some code

On 10/10/06, Neil Brown <[email protected]> wrote:
> On Tuesday October 10, [email protected] wrote:
> >
> > The autorun code is only used if this module is built into the static
> > kernel image. Adjust #ifdefs accordingly.
> >

Greatt - thanks! I wondered why my debian boxes weren't starting the
arrays unless I used mdadm
to 'poke' them. I think I filed a bug with Debian regarding this -
I'll see if I can find/update it.

Steve