Commit 7f6be376 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

block: pass a gendisk to bdev_add_partition

bdev_add_partition can only operate on the whole device.  Make that clear
by passing a gendisk instead of a block_device.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210810154512.1809898-3-hch@lst.deSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a08aa9bc
...@@ -347,8 +347,8 @@ void blk_free_ext_minor(unsigned int minor); ...@@ -347,8 +347,8 @@ void blk_free_ext_minor(unsigned int minor);
#define ADDPART_FLAG_NONE 0 #define ADDPART_FLAG_NONE 0
#define ADDPART_FLAG_RAID 1 #define ADDPART_FLAG_RAID 1
#define ADDPART_FLAG_WHOLEDISK 2 #define ADDPART_FLAG_WHOLEDISK 2
int bdev_add_partition(struct block_device *bdev, int partno, int bdev_add_partition(struct gendisk *disk, int partno, sector_t start,
sector_t start, sector_t length); sector_t length);
int bdev_del_partition(struct block_device *bdev, int partno); int bdev_del_partition(struct block_device *bdev, int partno);
int bdev_resize_partition(struct block_device *bdev, int partno, int bdev_resize_partition(struct block_device *bdev, int partno,
sector_t start, sector_t length); sector_t start, sector_t length);
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
static int blkpg_do_ioctl(struct block_device *bdev, static int blkpg_do_ioctl(struct block_device *bdev,
struct blkpg_partition __user *upart, int op) struct blkpg_partition __user *upart, int op)
{ {
struct gendisk *disk = bdev->bd_disk;
struct blkpg_partition p; struct blkpg_partition p;
long long start, length; long long start, length;
...@@ -40,7 +41,7 @@ static int blkpg_do_ioctl(struct block_device *bdev, ...@@ -40,7 +41,7 @@ static int blkpg_do_ioctl(struct block_device *bdev,
/* check if partition is aligned to blocksize */ /* check if partition is aligned to blocksize */
if (p.start & (bdev_logical_block_size(bdev) - 1)) if (p.start & (bdev_logical_block_size(bdev) - 1))
return -EINVAL; return -EINVAL;
return bdev_add_partition(bdev, p.pno, start, length); return bdev_add_partition(disk, p.pno, start, length);
case BLKPG_RESIZE_PARTITION: case BLKPG_RESIZE_PARTITION:
return bdev_resize_partition(bdev, p.pno, start, length); return bdev_resize_partition(bdev, p.pno, start, length);
default: default:
......
...@@ -451,11 +451,10 @@ static bool partition_overlaps(struct gendisk *disk, sector_t start, ...@@ -451,11 +451,10 @@ static bool partition_overlaps(struct gendisk *disk, sector_t start,
return overlap; return overlap;
} }
int bdev_add_partition(struct block_device *bdev, int partno, int bdev_add_partition(struct gendisk *disk, int partno, sector_t start,
sector_t start, sector_t length) sector_t length)
{ {
struct block_device *part; struct block_device *part;
struct gendisk *disk = bdev->bd_disk;
int ret; int ret;
mutex_lock(&disk->open_mutex); mutex_lock(&disk->open_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment