Commit 977115c0 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: stop using bdget_disk for partition 0 



We can just dereference the point in struct gendisk instead.  Also
remove the now unused export.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0d02129e

block/genhd.c

+0 −1
Original line number Diff line number Diff line
@@ -930,7 +930,6 @@ struct block_device *bdget_disk(struct gendisk *disk, int partno) 


	return bdev;

}

EXPORT_SYMBOL(bdget_disk);



/*

 * print a full list of all partitions - intended for places where the root

drivers/block/nbd.c

+1 −3
Original line number Diff line number Diff line
@@ -1488,12 +1488,10 @@ static int nbd_open(struct block_device *bdev, fmode_t mode) 
static void nbd_release(struct gendisk *disk, fmode_t mode)

{

	struct nbd_device *nbd = disk->private_data;

	struct block_device *bdev = bdget_disk(disk, 0);



	if (test_bit(NBD_RT_DISCONNECT_ON_CLOSE, &nbd->config->runtime_flags) &&

			bdev->bd_openers == 0)

			disk->part0->bd_openers == 0)

		nbd_disconnect_and_put(nbd);

	bdput(bdev);



	nbd_config_put(nbd);

	nbd_put(nbd);

drivers/block/xen-blkfront.c

+5 −15
Original line number Diff line number Diff line
@@ -2153,7 +2153,7 @@ static void blkfront_closing(struct blkfront_info *info) 
	}



	if (info->gd)

		bdev = bdget_disk(info->gd, 0);

		bdev = bdgrab(info->gd->part0);



	mutex_unlock(&info->mutex);
@@ -2518,7 +2518,7 @@ static int blkfront_remove(struct xenbus_device *xbdev) 


	disk = info->gd;

	if (disk)

		bdev = bdget_disk(disk, 0);

		bdev = bdgrab(disk->part0);



	info->xbdev = NULL;

	mutex_unlock(&info->mutex);
@@ -2595,19 +2595,11 @@ static int blkif_open(struct block_device *bdev, fmode_t mode) 
static void blkif_release(struct gendisk *disk, fmode_t mode)

{

	struct blkfront_info *info = disk->private_data;

	struct block_device *bdev;

	struct xenbus_device *xbdev;



	mutex_lock(&blkfront_mutex);



	bdev = bdget_disk(disk, 0);



	if (!bdev) {

		WARN(1, "Block device %s yanked out from us!\n", disk->disk_name);

	if (disk->part0->bd_openers)

		goto out_mutex;

	}

	if (bdev->bd_openers)

		goto out;



	/*

	 * Check if we have been instructed to close. We will have
@@ -2619,7 +2611,7 @@ static void blkif_release(struct gendisk *disk, fmode_t mode) 


	if (xbdev && xbdev->state == XenbusStateClosing) {

		/* pending switch to state closed */

		dev_info(disk_to_dev(bdev->bd_disk), "releasing disk\n");

		dev_info(disk_to_dev(disk), "releasing disk\n");

		xlvbd_release_gendisk(info);

		xenbus_frontend_closed(info->xbdev);

 	}
@@ -2628,14 +2620,12 @@ static void blkif_release(struct gendisk *disk, fmode_t mode) 


	if (!xbdev) {

		/* sudden device removal */

		dev_info(disk_to_dev(bdev->bd_disk), "releasing disk\n");

		dev_info(disk_to_dev(disk), "releasing disk\n");

		xlvbd_release_gendisk(info);

		disk->private_data = NULL;

		free_info(info);

	}



out:

	bdput(bdev);

out_mutex:

	mutex_unlock(&blkfront_mutex);

}

drivers/block/zram/zram_drv.c

+2 −12
Original line number Diff line number Diff line
@@ -1760,15 +1760,12 @@ static ssize_t reset_store(struct device *dev, 
		return -EINVAL;



	zram = dev_to_zram(dev);

	bdev = bdget_disk(zram->disk, 0);

	if (!bdev)

		return -ENOMEM;

	bdev = zram->disk->part0;



	mutex_lock(&bdev->bd_mutex);

	/* Do not reset an active device or claimed device */

	if (bdev->bd_openers || zram->claim) {

		mutex_unlock(&bdev->bd_mutex);

		bdput(bdev);

		return -EBUSY;

	}
@@ -1779,7 +1776,6 @@ static ssize_t reset_store(struct device *dev, 
	/* Make sure all the pending I/O are finished */

	fsync_bdev(bdev);

	zram_reset_device(zram);

	bdput(bdev);



	mutex_lock(&bdev->bd_mutex);

	zram->claim = false;
@@ -1965,16 +1961,11 @@ static int zram_add(void) 


static int zram_remove(struct zram *zram)

{

	struct block_device *bdev;



	bdev = bdget_disk(zram->disk, 0);

	if (!bdev)

		return -ENOMEM;

	struct block_device *bdev = zram->disk->part0;



	mutex_lock(&bdev->bd_mutex);

	if (bdev->bd_openers || zram->claim) {

		mutex_unlock(&bdev->bd_mutex);

		bdput(bdev);

		return -EBUSY;

	}
@@ -1986,7 +1977,6 @@ static int zram_remove(struct zram *zram) 
	/* Make sure all the pending I/O are finished */

	fsync_bdev(bdev);

	zram_reset_device(zram);

	bdput(bdev);



	pr_info("Removed device: %s\n", zram->disk->disk_name);

drivers/md/dm.c

+2 −14
Original line number Diff line number Diff line
@@ -2375,16 +2375,11 @@ struct dm_table *dm_swap_table(struct mapped_device *md, struct dm_table *table) 
 */

static int lock_fs(struct mapped_device *md)

{

	struct block_device *bdev;

	int r;



	WARN_ON(test_bit(DMF_FROZEN, &md->flags));



	bdev = bdget_disk(md->disk, 0);

	if (!bdev)

		return -ENOMEM;

	r = freeze_bdev(bdev);

	bdput(bdev);

	r = freeze_bdev(md->disk->part0);

	if (!r)

		set_bit(DMF_FROZEN, &md->flags);

	return r;
@@ -2392,16 +2387,9 @@ static int lock_fs(struct mapped_device *md) 


static void unlock_fs(struct mapped_device *md)

{

	struct block_device *bdev;



	if (!test_bit(DMF_FROZEN, &md->flags))

		return;



	bdev = bdget_disk(md->disk, 0);

	if (!bdev)

		return;

	thaw_bdev(bdev);

	bdput(bdev);

	thaw_bdev(md->disk->part0);

	clear_bit(DMF_FROZEN, &md->flags);

}