1 files changed, 4 insertions, 13 deletions

diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index 7ba0fcf7b06b..57ac72c1715a 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -278,18 +278,12 @@ aoeblk_gdalloc(void *vp)
         if (q == NULL) {
                 pr_err("aoe: cannot allocate block queue for %ld.%d\n",
                         d->aoemajor, d->aoeminor);
-                mempool_destroy(mp);
-                goto err_disk;
+                goto err_mempool;
         }
 
-        d->blkq = blk_alloc_queue(GFP_KERNEL);
-        if (!d->blkq)
-                goto err_mempool;
-        d->blkq->backing_dev_info.name = "aoe";
-        if (bdi_init(&d->blkq->backing_dev_info))
-                goto err_blkq;
         spin_lock_irqsave(&d->lock, flags);
-        blk_queue_max_hw_sectors(d->blkq, BLK_DEF_MAX_SECTORS);
+        blk_queue_max_hw_sectors(q, BLK_DEF_MAX_SECTORS);
+        q->backing_dev_info.name = "aoe";
         q->backing_dev_info.ra_pages = READ_AHEAD / PAGE_CACHE_SIZE;
         d->bufpool = mp;
         d->blkq = gd->queue = q;
@@ -314,11 +308,8 @@ 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);
+        mempool_destroy(mp);
 err_disk:
         put_disk(gd);
 err: