Re: [PATCH] AOE: fix up the block device registration so that itactually works now.

[Ed L Cashin]

Greg KH <greg@xxxxxxxxx> writes:

> Ed, I need the following patch against the latest -bk tree in order to
> get the aoe code to load and work properly.  Does it look good to you?

I'm having trouble seeing what's in -bk.  I have a clone of
bk://linux.bkbits.net/linux-2.5, but when I "bk pull" there it says
"Nothing to pull."  And my clone doesn't have all the aoe patches I've
seen get pushed to -bk.

...
> -------------
>
> AOE: fix up the block device registration so that it actually works now.
>
> Signed-off-by: Greg Kroah-Hartman <greg@xxxxxxxxx>
>
> diff -Nru a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
> --- a/drivers/block/aoe/aoeblk.c	2005-01-18 16:06:57 -08:00
> +++ b/drivers/block/aoe/aoeblk.c	2005-01-18 16:06:57 -08:00
> @@ -249,6 +249,7 @@
>  aoeblk_exit(void)
>  {
>  	kmem_cache_destroy(buf_pool_cache);
> +	unregister_blkdev(AOE_MAJOR, DEVICE_NAME);
>  }

The unregister_blkdev should already be in aoemain.c:aoe_exit.

static void
aoe_exit(void)
{
	discover_timer(TKILL);

	aoenet_exit();
	unregister_blkdev(AOE_MAJOR, DEVICE_NAME);
	aoechr_exit();
	aoedev_exit();
	aoeblk_exit();		/* free cache after de-allocating bufs */
}


>  int __init
> diff -Nru a/drivers/block/aoe/aoemain.c b/drivers/block/aoe/aoemain.c
> --- a/drivers/block/aoe/aoemain.c	2005-01-18 16:06:57 -08:00
> +++ b/drivers/block/aoe/aoemain.c	2005-01-18 16:06:57 -08:00
> @@ -82,11 +82,6 @@
>  	ret = aoenet_init();
>  	if (ret)
>  		goto net_fail;
> -	ret = register_blkdev(AOE_MAJOR, DEVICE_NAME);
> -	if (ret < 0) {
> -		printk(KERN_ERR "aoe: aoeblk_init: can't register major\n");
> -		goto blkreg_fail;
> -	}
>  
>  	printk(KERN_INFO
>  	       "aoe: aoe_init: AoE v2.6-%s initialised.\n",

Hmm.  I'll try to send a patch against usb, since I can pull from
there.

-- 
  Ed L Cashin <ecashin@xxxxxxxxxx>

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/