aoe fix for 2.6.31
Subsystems (2)
Hi Linus,
Please pull this single fix for 2.6.31, which fixes a problem with the way that aoe handles the request queue. It used to embed the queue inside another structure, but this breaks for a variety of reasons.
git://git.kernel.dk/linux-2.6-block.git for-linus
Ed L. Cashin (1):
aoe: allocate unused request_queue for sysfs
drivers/block/aoe/aoe.h | 2 +- drivers/block/aoe/aoeblk.c | 12 +++++++++--- drivers/block/aoe/aoedev.c | 1 + 3 files changed, 11 insertions(+), 4 deletions(-)
drivers/block/aoe/aoe.h +1 -1
@@ -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;
drivers/block/aoe/aoeblk.c +9 -3
@@ -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:
drivers/block/aoe/aoedev.c +1 -0
@@ -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); }
Signature · 1 line
Jens Axboe