Merge branch 'master' into for-2.6.31

Conflicts:
	drivers/ide/ide-io.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 6d5950839bd0..132120ae4bde 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -932,8 +932,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);
 
@@ -947,6 +945,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);
 }
@@ -975,8 +975,10 @@ static void backend_changed(struct xenbus_device *dev,
                 break;
 
         case XenbusStateClosing:
-                if (info->gd == NULL)
-                        xenbus_dev_fatal(dev, -ENODEV, "gd is NULL");
+                if (info->gd == NULL) {
+                        xenbus_frontend_closed(dev);
+                        break;
+                }
                 bd = bdget_disk(info->gd, 0);
                 if (bd == NULL)
                         xenbus_dev_fatal(dev, -ENODEV, "bdget failed");