blkfront: Remove obsolete info->users
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>
This commit is contained in:
committed by
Jens Axboe
parent
fa1bd3591a
commit
acfca3c622
@@ -1168,9 +1168,6 @@ static int blkif_open(struct block_device *bdev, fmode_t mode)
|
|||||||
|
|
||||||
mutex_unlock(&info->mutex);
|
mutex_unlock(&info->mutex);
|
||||||
|
|
||||||
if (!err)
|
|
||||||
++info->users;
|
|
||||||
|
|
||||||
out:
|
out:
|
||||||
unlock_kernel();
|
unlock_kernel();
|
||||||
return err;
|
return err;
|
||||||
@@ -1183,12 +1180,13 @@ static int blkif_release(struct gendisk *disk, fmode_t mode)
|
|||||||
struct xenbus_device *xbdev;
|
struct xenbus_device *xbdev;
|
||||||
|
|
||||||
lock_kernel();
|
lock_kernel();
|
||||||
if (--info->users)
|
|
||||||
goto out;
|
|
||||||
|
|
||||||
bdev = bdget_disk(disk, 0);
|
bdev = bdget_disk(disk, 0);
|
||||||
bdput(bdev);
|
bdput(bdev);
|
||||||
|
|
||||||
|
if (bdev->bd_openers)
|
||||||
|
goto out;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check if we have been instructed to close. We will have
|
* Check if we have been instructed to close. We will have
|
||||||
* deferred this request, because the bdev was still open.
|
* 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);
|
kfree(info);
|
||||||
}
|
}
|
||||||
|
|
||||||
out:
|
|
||||||
unlock_kernel();
|
unlock_kernel();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user