Skip to content

Commit

Permalink
block: simplify partition removal
Browse files Browse the repository at this point in the history
Always look up the first available entry instead of the complicated
stateful traversal.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210406062303.811835-7-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Christoph Hellwig authored and axboe committed Apr 8, 2021
1 parent c76f48e commit 6c4541a
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions block/partitions/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -528,15 +528,17 @@ static bool disk_unlock_native_capacity(struct gendisk *disk)

void blk_drop_partitions(struct gendisk *disk)
{
struct disk_part_iter piter;
struct block_device *part;
unsigned long idx;

lockdep_assert_held(&disk->part0->bd_mutex);

disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY);
while ((part = disk_part_iter_next(&piter)))
xa_for_each_start(&disk->part_tbl, idx, part, 1) {
if (!bdgrab(part))
continue;
delete_partition(part);
disk_part_iter_exit(&piter);
bdput(part);
}
}

static bool blk_add_partition(struct gendisk *disk, struct block_device *bdev,
Expand Down

0 comments on commit 6c4541a

Please sign in to comment.