1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 715de7d8ce01..9c5a25a462e6 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -1168,9 +1168,6 @@ static int blkif_open(struct block_device *bdev, fmode_t mode)
 
         mutex_unlock(&info->mutex);
 
-        if (!err)
-                ++info->users;
-
 out:
         unlock_kernel();
         return err;
@@ -1183,12 +1180,13 @@ static int blkif_release(struct gendisk *disk, fmode_t mode)
         struct xenbus_device *xbdev;
 
         lock_kernel();
-        if (--info->users)
-                goto out;
 
         bdev = bdget_disk(disk, 0);
         bdput(bdev);
 
+        if (bdev->bd_openers)
+                goto out;
+
         /*
          * Check if we have been instructed to close. We will have
          * deferred this request, because the bdev was still open.
@@ -1212,7 +1210,6 @@ static int blkif_release(struct gendisk *disk, fmode_t mode)
                 kfree(info);
         }
 
-out:
         unlock_kernel();
         return 0;
 }