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

From: Greg KH <greg@kroah.com>
To: Ed L Cashin <ecashin@coraid.com>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] AOE: fix up the block device registration so that it actually works now.
Date: Tue, 18 Jan 2005 16:09:36 -0800	[thread overview]
Message-ID: <20050119000935.GA22454@kroah.com> (raw)

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?

thanks,

greg k-h

-------------

AOE: fix up the block device registration so that it actually works now.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

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);
 }
 
 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",
