From 3087d9a2ef79de2e8870eb5945c1b61a010bad26 Mon Sep 17 00:00:00 2001 From: Daniel Stodden Date: Fri, 30 Apr 2010 22:01:16 +0000 Subject: [PATCH] --- yaml --- r: 208281 b: refs/heads/master c: 89de1669ace055b56f1de1c9f5aca26dd7f17f25 h: refs/heads/master i: 208279: bd2a223a64a3bdcadcd3400c8cdf628a2cde2f1c v: v3 --- [refs] | 2 +- trunk/drivers/block/xen-blkfront.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3c776efbbeb6..5f8dc74e88d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b61cb90c2ad8c853b4dd53eec200bacd2f02172 +refs/heads/master: 89de1669ace055b56f1de1c9f5aca26dd7f17f25 diff --git a/trunk/drivers/block/xen-blkfront.c b/trunk/drivers/block/xen-blkfront.c index 7fa2a1db51e6..3258ae67ac7a 100644 --- a/trunk/drivers/block/xen-blkfront.c +++ b/trunk/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);