We need not mind if users grab a late handle on a closing disk. We probably even should not. But we have to make sure it's not a dead one already Let the bdev deal with a gendisk deleted under its feet. Takes the info mutex to decide a race against backend closing. Signed-off-by: Daniel Stodden diff -r fbf1ab5b4c61 -r 5bfa144b3a9b drivers/block/xen-blkfront.c --- a/drivers/block/xen-blkfront.c Fri Apr 30 14:58:59 2010 -0700 +++ b/drivers/block/xen-blkfront.c Fri Apr 30 14:58:59 2010 -0700 @@ -1120,12 +1120,27 @@ static int blkif_open(struct block_device *bdev, fmode_t mode) { - struct blkfront_info *info = bdev->bd_disk->private_data; + struct gendisk *disk = bdev->bd_disk; + struct blkfront_info *info; + int err = 0; - if (!info->xbdev) - return -ENODEV; - info->users++; - return 0; + info = disk->private_data; + if (!info) + /* xbdev gone */ + return -ERESTARTSYS; + + mutex_lock(&info->mutex); + + if (!info->gd) + /* xbdev is closed */ + err = -ERESTARTSYS; + + mutex_unlock(&info->mutex); + + if (!err) + ++info->users; + + return err; } static int blkif_release(struct gendisk *disk, fmode_t mode)