From 4041410ee18cd874b1c3da17e638afc9f03ddeb3 Mon Sep 17 00:00:00 2001
From: Ed Cashin <ecashin@coraid.com>
Date: Wed, 9 Sep 2009 14:10:18 +0200
Subject: [PATCH] --- yaml --- r: 157281 b: refs/heads/master c:
 7135a71b19be1faf48b7148d77844d03bc0717d6 h: refs/heads/master i:   157279:
 a754a678cd7f564d64f40f9237598dead81180b2 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/block/aoe/aoe.h    |  2 +-
 trunk/drivers/block/aoe/aoeblk.c | 12 +++++++++---
 trunk/drivers/block/aoe/aoedev.c |  1 +
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f1f36d05135e..d539a19e390a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6890f6f3dc2d9024a08b1a149d9bd5208eea350
+refs/heads/master: 7135a71b19be1faf48b7148d77844d03bc0717d6
diff --git a/trunk/drivers/block/aoe/aoe.h b/trunk/drivers/block/aoe/aoe.h
index 5e41e6dd657b..db195abad698 100644
--- a/trunk/drivers/block/aoe/aoe.h
+++ b/trunk/drivers/block/aoe/aoe.h
@@ -155,7 +155,7 @@ struct aoedev {
 	u16 fw_ver;		/* version of blade's firmware */
 	struct work_struct work;/* disk create work struct */
 	struct gendisk *gd;
-	struct request_queue blkq;
+	struct request_queue *blkq;
 	struct hd_geometry geo; 
 	sector_t ssize;
 	struct timer_list timer;
diff --git a/trunk/drivers/block/aoe/aoeblk.c b/trunk/drivers/block/aoe/aoeblk.c
index 2307a271bdc9..1e15889c4b98 100644
--- a/trunk/drivers/block/aoe/aoeblk.c
+++ b/trunk/drivers/block/aoe/aoeblk.c
@@ -264,9 +264,12 @@ aoeblk_gdalloc(void *vp)
 		goto err_disk;
 	}
 
-	blk_queue_make_request(&d->blkq, aoeblk_make_request);
-	if (bdi_init(&d->blkq.backing_dev_info))
+	d->blkq = blk_alloc_queue(GFP_KERNEL);
+	if (!d->blkq)
 		goto err_mempool;
+	blk_queue_make_request(d->blkq, aoeblk_make_request);
+	if (bdi_init(&d->blkq->backing_dev_info))
+		goto err_blkq;
 	spin_lock_irqsave(&d->lock, flags);
 	gd->major = AOE_MAJOR;
 	gd->first_minor = d->sysminor * AOE_PARTITIONS;
@@ -276,7 +279,7 @@ aoeblk_gdalloc(void *vp)
 	snprintf(gd->disk_name, sizeof gd->disk_name, "etherd/e%ld.%d",
 		d->aoemajor, d->aoeminor);
 
-	gd->queue = &d->blkq;
+	gd->queue = d->blkq;
 	d->gd = gd;
 	d->flags &= ~DEVFL_GDALLOC;
 	d->flags |= DEVFL_UP;
@@ -287,6 +290,9 @@ aoeblk_gdalloc(void *vp)
 	aoedisk_add_sysfs(d);
 	return;
 
+err_blkq:
+	blk_cleanup_queue(d->blkq);
+	d->blkq = NULL;
 err_mempool:
 	mempool_destroy(d->bufpool);
 err_disk:
diff --git a/trunk/drivers/block/aoe/aoedev.c b/trunk/drivers/block/aoe/aoedev.c
index eeea477d9601..fa67027789aa 100644
--- a/trunk/drivers/block/aoe/aoedev.c
+++ b/trunk/drivers/block/aoe/aoedev.c
@@ -113,6 +113,7 @@ aoedev_freedev(struct aoedev *d)
 	if (d->bufpool)
 		mempool_destroy(d->bufpool);
 	skbpoolfree(d);
+	blk_cleanup_queue(d->blkq);
 	kfree(d);
 }