Commit 2f4731dc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove bdput 



Now that we've stopped using inode references for anything meaninful
in the block layer get rid of the helper to put it and just open code
the call to iput on the block_device inode.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarChaitanya Kulkarni <ckulkarnilinux@gmail.com>
Link: https://lore.kernel.org/r/20210722075402.983367-10-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 14cf1dbb

block/genhd.c

+2 −2
Original line number Diff line number Diff line
@@ -1076,7 +1076,7 @@ static void disk_release(struct device *dev) 
	xa_destroy(&disk->part_tbl);

	if (test_bit(GD_QUEUE_REF, &disk->state) && disk->queue)

		blk_put_queue(disk->queue);

	bdput(disk->part0);	/* frees the disk */

	iput(disk->part0->bd_inode);	/* frees the disk */

}

struct class block_class = {

	.name		= "block",
@@ -1261,7 +1261,7 @@ struct gendisk *__alloc_disk_node(int minors, int node_id) 


out_destroy_part_tbl:

	xa_destroy(&disk->part_tbl);

	bdput(disk->part0);

	iput(disk->part0->bd_inode);

out_free_disk:

	kfree(disk);

	return NULL;

block/partitions/core.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static void part_release(struct device *dev) 
	if (MAJOR(dev->devt) == BLOCK_EXT_MAJOR)

		blk_free_ext_minor(MINOR(dev->devt));

	put_disk(dev_to_bdev(dev)->bd_disk);

	bdput(dev_to_bdev(dev));

	iput(dev_to_bdev(dev)->bd_inode);

}



static int part_uevent(struct device *dev, struct kobj_uevent_env *env)

fs/block_dev.c

+0 −6
Original line number Diff line number Diff line
@@ -934,12 +934,6 @@ long nr_blockdev_pages(void) 
	return ret;

}



void bdput(struct block_device *bdev)

{

	iput(bdev->bd_inode);

}

EXPORT_SYMBOL(bdput);

 

/**

 * bd_may_claim - test whether a block device can be claimed

 * @bdev: block device of interest

include/linux/blkdev.h

+0 −1
Original line number Diff line number Diff line
@@ -1984,7 +1984,6 @@ void blkdev_put_no_open(struct block_device *bdev); 
struct block_device *bdev_alloc(struct gendisk *disk, u8 partno);

void bdev_add(struct block_device *bdev, dev_t dev);

struct block_device *I_BDEV(struct inode *inode);

void bdput(struct block_device *);

int truncate_bdev_range(struct block_device *bdev, fmode_t mode, loff_t lstart,

		loff_t lend);