Skip to content

Commit

Permalink
blkfront: Fix blkfront backend switch race (bdev open)
Browse files Browse the repository at this point in the history
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 <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 b70f5fa commit 1396174
Showing 1 changed file with 24 additions and 7 deletions.
31 changes: 24 additions & 7 deletions drivers/block/xen-blkfront.c
Original file line number Diff line number Diff line change
Expand Up @@ -1118,16 +1118,33 @@ static int blkfront_is_ready(struct xenbus_device *dev)

static int blkif_open(struct block_device *bdev, fmode_t mode)
{
struct blkfront_info *info = bdev->bd_disk->private_data;

if (!info->xbdev)
return -ENODEV;
struct gendisk *disk = bdev->bd_disk;
struct blkfront_info *info;
int err = 0;

lock_kernel();
info->users++;
unlock_kernel();

return 0;
info = disk->private_data;
if (!info) {
/* xbdev gone */
err = -ERESTARTSYS;
goto out;
}

mutex_lock(&info->mutex);

if (!info->gd)
/* xbdev is closed */
err = -ERESTARTSYS;

mutex_unlock(&info->mutex);

if (!err)
++info->users;

unlock_kernel();
out:
return err;
}

static int blkif_release(struct gendisk *disk, fmode_t mode)
Expand Down

0 comments on commit 1396174

Please sign in to comment.