Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-01 18:52:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

block: pass a gendisk to bdev_del_partition

Browse Source 
bdev_del_partition can only operate on the whole device.  Make that clear
by passing a gendisk instead of a block_device.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210810154512.1809898-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2021-08-10 17:45:11 +02:00 committed by Jens Axboe
parent 7f6be3765e
commit 926fbb1677
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk.h
View File

@ -349,7 +349,7 @@ void blk_free_ext_minor(unsigned int minor);
#define ADDPART_FLAG_WHOLEDISK 2 #define ADDPART_FLAG_WHOLEDISK 2
int bdev_add_partition(struct gendisk *disk, int partno, sector_t start, int bdev_add_partition(struct gendisk *disk, int partno, sector_t start,
sector_t length); sector_t length);
int bdev_del_partition(struct block_device *bdev, int partno); int bdev_del_partition(struct gendisk *disk, 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);

2
block/ioctl.c
View File

@ -31,7 +31,7 @@ static int blkpg_do_ioctl(struct block_device *bdev,
return -EINVAL; return -EINVAL;
if (op == BLKPG_DEL_PARTITION) if (op == BLKPG_DEL_PARTITION)
return bdev_del_partition(bdev, p.pno); return bdev_del_partition(disk, p.pno);
start = p.start >> SECTOR_SHIFT; start = p.start >> SECTOR_SHIFT;
length = p.length >> SECTOR_SHIFT; length = p.length >> SECTOR_SHIFT;

8
block/partitions/core.c
View File

@ -476,13 +476,13 @@ int bdev_add_partition(struct gendisk *disk, int partno, sector_t start,
return ret; return ret;
} }
int bdev_del_partition(struct block_device *bdev, int partno) int bdev_del_partition(struct gendisk *disk, int partno)
{ {
struct block_device *part = NULL; struct block_device *part = NULL;
int ret = -ENXIO; int ret = -ENXIO;
mutex_lock(&bdev->bd_disk->open_mutex); mutex_lock(&disk->open_mutex);
part = xa_load(&bdev->bd_disk->part_tbl, partno); part = xa_load(&disk->part_tbl, partno);
if (!part) if (!part)
goto out_unlock; goto out_unlock;
@ -493,7 +493,7 @@ int bdev_del_partition(struct block_device *bdev, int partno)
delete_partition(part); delete_partition(part);
ret = 0; ret = 0;
out_unlock: out_unlock:
mutex_unlock(&bdev->bd_disk->open_mutex); mutex_unlock(&disk->open_mutex);
return ret; return ret;
} }