From f8019efbb8da92270ee4c561bce672cf7e06eeb9 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 19 May 2009 08:27:42 +0200 Subject: [PATCH] --- yaml --- r: 145153 b: refs/heads/master c: 31a14400e8f365e5d4d1a0b2a1ef4d5405d6091e h: refs/heads/master i: 145151: ae8d16e53b322b41d79a49662cfa845824eed738 v: v3 --- [refs] | 2 +- trunk/drivers/block/xen-blkfront.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index abdcaa662631..49ba2e755612 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28afea5b2ffaa48f4f43d22ae8edcc384c05df80 +refs/heads/master: 31a14400e8f365e5d4d1a0b2a1ef4d5405d6091e diff --git a/trunk/drivers/block/xen-blkfront.c b/trunk/drivers/block/xen-blkfront.c index 6971a12e8b9b..a6cbf7b808e6 100644 --- a/trunk/drivers/block/xen-blkfront.c +++ b/trunk/drivers/block/xen-blkfront.c @@ -934,8 +934,6 @@ static void blkfront_closing(struct xenbus_device *dev) spin_lock_irqsave(&blkif_io_lock, flags); - del_gendisk(info->gd); - /* No more blkif_request(). */ blk_stop_queue(info->rq); @@ -949,6 +947,8 @@ static void blkfront_closing(struct xenbus_device *dev) blk_cleanup_queue(info->rq); info->rq = NULL; + del_gendisk(info->gd); + out: xenbus_frontend_closed(dev); }