[04/32] block: Use blkdev_get_handle_by_dev() in disk_scan_partitions() and blkdev_bszset()

Commit Message

Jan Kara July 4, 2023, 12:21 p.m. UTC

Convert disk_scan_partitions() and blkdev_bszset() to use
blkdev_get_handle_by_dev().

Signed-off-by: Jan Kara <[e-mail]>
---
 block/genhd.c | 12 ++++++------
 block/ioctl.c |  6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

Patch

diff --git a/block/genhd.c b/block/genhd.c
index 3d287b32d50d..d363ddb8d93a 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -342,7 +342,7 @@  EXPORT_SYMBOL_GPL(disk_uevent);
 
 int disk_scan_partitions(struct gendisk *disk, blk_mode_t mode)
 {
-	struct block_device *bdev;
+	struct bdev_handle *handle;
 	int ret = 0;
 
 	if (disk->flags & (GENHD_FL_NO_PART | GENHD_FL_HIDDEN))
@@ -366,12 +366,12 @@  int disk_scan_partitions(struct gendisk *disk, blk_mode_t mode)
 	}
 
 	set_bit(GD_NEED_PART_SCAN, &disk->state);
-	bdev = blkdev_get_by_dev(disk_devt(disk), mode & ~BLK_OPEN_EXCL, NULL,
-				 NULL);
-	if (IS_ERR(bdev))
-		ret =  PTR_ERR(bdev);
+	handle = blkdev_get_handle_by_dev(disk_devt(disk),
+					  mode & ~BLK_OPEN_EXCL, NULL, NULL);
+	if (IS_ERR(handle))
+		ret = PTR_ERR(handle);
 	else
-		blkdev_put(bdev, NULL);
+		blkdev_handle_put(handle);
 
 	/*
 	 * If blkdev_get_by_dev() failed early, GD_NEED_PART_SCAN is still set,
diff --git a/block/ioctl.c b/block/ioctl.c
index 3be11941fb2d..940a7b9284c4 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -458,6 +458,7 @@  static int blkdev_bszset(struct block_device *bdev, blk_mode_t mode,
 		int __user *argp)
 {
 	int ret, n;
+	struct bdev_handle *handle;
 
 	if (!capable(CAP_SYS_ADMIN))
 		return -EACCES;
@@ -469,10 +470,11 @@  static int blkdev_bszset(struct block_device *bdev, blk_mode_t mode,
 	if (mode & BLK_OPEN_EXCL)
 		return set_blocksize(bdev, n);
 
-	if (IS_ERR(blkdev_get_by_dev(bdev->bd_dev, mode, &bdev, NULL)))
+	handle = blkdev_get_handle_by_dev(bdev->bd_dev, mode, &bdev, NULL);
+	if (IS_ERR(handle))
 		return -EBUSY;
 	ret = set_blocksize(bdev, n);
-	blkdev_put(bdev, &bdev);
+	blkdev_handle_put(handle);
 
 	return ret;
 }