Skip to content

Commit

Permalink
blkfront: Remove obsolete info->users
Browse files Browse the repository at this point in the history
This is just bd_openers, protected by the bd_mutex.

Signed-off-by: Daniel Stodden <daniel.stodden@citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
  • Loading branch information
Daniel Stodden authored and Jens Axboe committed Aug 7, 2010
1 parent acfca3c commit 7b32d10
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions drivers/block/xen-blkfront.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,6 @@ struct blkfront_info
unsigned long shadow_free;
int feature_barrier;
int is_ready;

/**
* The number of people holding this device open. We won't allow a
* hot-unplug unless this is 0.
*/
int users;
};

static DEFINE_SPINLOCK(blkif_io_lock);
Expand Down Expand Up @@ -977,7 +971,7 @@ blkfront_closing(struct blkfront_info *info)

mutex_lock(&bdev->bd_mutex);

if (info->users) {
if (bdev->bd_openers) {
xenbus_dev_error(xbdev, -EBUSY,
"Device in use; refusing to close");
xenbus_switch_state(xbdev, XenbusStateClosing);
Expand Down Expand Up @@ -1126,7 +1120,7 @@ static int blkfront_remove(struct xenbus_device *xbdev)
mutex_lock(&bdev->bd_mutex);
info = disk->private_data;

if (info && !info->users) {
if (info && !bdev->bd_openers) {
xlvbd_release_gendisk(info);
disk->private_data = NULL;
kfree(info);
Expand Down

0 comments on commit 7b32d10

Please sign in to comment.