diff options
| author | Daniel Stodden | 2010-05-01 00:01:16 +0200 |
|---|---|---|
| committer | Jens Axboe | 2010-08-07 18:31:35 +0200 |
| commit | 89de1669ace055b56f1de1c9f5aca26dd7f17f25 (patch) | |
| tree | c67f2fa68f79eb9e4c31ef6991b23a58602039d6 /drivers/block | |
| parent | xenbus: Make xenbus_switch_state transactional (diff) | |
| download | kernel-qcow2-linux-89de1669ace055b56f1de1c9f5aca26dd7f17f25.tar.gz kernel-qcow2-linux-89de1669ace055b56f1de1c9f5aca26dd7f17f25.tar.xz kernel-qcow2-linux-89de1669ace055b56f1de1c9f5aca26dd7f17f25.zip | |
blkfront: Fix backtrace in del_gendisk
The call to del_gendisk follows an non-refcounted gd->queue
pointer. We release the last ref in blk_cleanup_queue. Fixed by
reordering releases accordingly.
Signed-off-by: Daniel Stodden <daniel.stodden@citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/xen-blkfront.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 7fa2a1db51e6..3258ae67ac7a 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -1021,14 +1021,14 @@ static void blkfront_closing(struct blkfront_info *info) /* Flush gnttab callback work. Must be done with no locks held. */ flush_scheduled_work(); - blk_cleanup_queue(info->rq); - info->rq = NULL; - minor = info->gd->first_minor; nr_minors = info->gd->minors; del_gendisk(info->gd); xlbd_release_minors(minor, nr_minors); + blk_cleanup_queue(info->rq); + info->rq = NULL; + out: if (info->xbdev) xenbus_frontend_closed(info->xbdev); |