Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 09:12:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

block: remove blk_drop_partitions

Browse Source 
There is only a single caller left, so fold the loop into that.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Acked-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Link: https://lore.kernel.org/r/20230601094459.1350643-9-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2023-06-01 11:44:51 +02:00 committed by Jens Axboe
parent eec1be4c30
commit 00080f7fb7
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
block/partitions/core.c
View File

@ -524,17 +524,6 @@ static bool disk_unlock_native_capacity(struct gendisk *disk)
return true;
}
static void blk_drop_partitions(struct gendisk *disk)
{
struct block_device *part;
unsigned long idx;
lockdep_assert_held(&disk->open_mutex);
xa_for_each_start(&disk->part_tbl, idx, part, 1)
delete_partition(part);
}
static bool blk_add_partition(struct gendisk *disk,
struct parsed_partitions *state, int p)
{
@ -651,6 +640,8 @@ static int blk_add_partitions(struct gendisk *disk)
int bdev_disk_changed(struct gendisk *disk, bool invalidate)
{
struct block_device *part;
unsigned long idx;
int ret = 0;
lockdep_assert_held(&disk->open_mutex);
@ -663,8 +654,9 @@ int bdev_disk_changed(struct gendisk *disk, bool invalidate)
return -EBUSY;
sync_blockdev(disk->part0);
invalidate_bdev(disk->part0);
blk_drop_partitions(disk);
xa_for_each_start(&disk->part_tbl, idx, part, 1)
delete_partition(part);
clear_bit(GD_NEED_PART_SCAN, &disk->state);
/*