Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=43cbe2cbdd5320f1ac785c6f016923609831effe
Commit:     43cbe2cbdd5320f1ac785c6f016923609831effe
Parent:     5ea139503bc7907ca0772c25bbcfb7fbb8ffc16b
Author:     Andrew Morton <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 10 15:49:13 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Dec 10 19:43:54 2007 -0800

    aoe: properly initialise the request_queue's backing_dev_info
    
    AOE forgot to initialise its queue's backing_dev_info, so kernels crash.
    (http://bugzilla.kernel.org/show_bug.cgi?id=9482)
    
    Fix that and consoldate aoeblk_gdalloc()'s error handling.
    
    Thanks be to Jon for reporting and testing.
    
    Cc: "Ed L. Cashin" <[EMAIL PROTECTED]>
    Cc: <[EMAIL PROTECTED]>
    Cc: "Jon Nelson" <[EMAIL PROTECTED]>
    Acked-by: Peter Zijlstra <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/block/aoe/aoeblk.c |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index b1d00ef..ad00b3d 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -6,6 +6,7 @@
 
 #include <linux/hdreg.h>
 #include <linux/blkdev.h>
+#include <linux/backing-dev.h>
 #include <linux/fs.h>
 #include <linux/ioctl.h>
 #include <linux/genhd.h>
@@ -210,25 +211,20 @@ aoeblk_gdalloc(void *vp)
        if (gd == NULL) {
                printk(KERN_ERR "aoe: cannot allocate disk structure for 
%ld.%ld\n",
                        d->aoemajor, d->aoeminor);
-               spin_lock_irqsave(&d->lock, flags);
-               d->flags &= ~DEVFL_GDALLOC;
-               spin_unlock_irqrestore(&d->lock, flags);
-               return;
+               goto err;
        }
 
        d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache);
        if (d->bufpool == NULL) {
                printk(KERN_ERR "aoe: cannot allocate bufpool for %ld.%ld\n",
                        d->aoemajor, d->aoeminor);
-               put_disk(gd);
-               spin_lock_irqsave(&d->lock, flags);
-               d->flags &= ~DEVFL_GDALLOC;
-               spin_unlock_irqrestore(&d->lock, flags);
-               return;
+               goto err_disk;
        }
 
-       spin_lock_irqsave(&d->lock, flags);
        blk_queue_make_request(&d->blkq, aoeblk_make_request);
+       if (bdi_init(&d->blkq.backing_dev_info))
+               goto err_mempool;
+       spin_lock_irqsave(&d->lock, flags);
        gd->major = AOE_MAJOR;
        gd->first_minor = d->sysminor * AOE_PARTITIONS;
        gd->fops = &aoe_bdops;
@@ -246,6 +242,16 @@ aoeblk_gdalloc(void *vp)
 
        add_disk(gd);
        aoedisk_add_sysfs(d);
+       return;
+
+err_mempool:
+       mempool_destroy(d->bufpool);
+err_disk:
+       put_disk(gd);
+err:
+       spin_lock_irqsave(&d->lock, flags);
+       d->flags &= ~DEVFL_GDALLOC;
+       spin_unlock_irqrestore(&d->lock, flags);
 }
 
 void
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to