niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

block: take bd_mutex around delete_partitions in del_gendisk

Browse source 
There is nothing preventing an ioctl from trying do delete partition
concurrenly with del_gendisk, so take open_mutex to serialize against
that.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210406062303.811835-6-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2021-04-06 08:22:56 +02:00 • committed by Jens Axboe
parent d3c4a43d92
commit c76f48eb5c
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
block/genhd.c
View file

@ -680,7 +680,11 @@ void del_gendisk(struct gendisk *disk)
* disk is marked as dead (GENHD_FL_UP cleared). * disk is marked as dead (GENHD_FL_UP cleared).
*/ */
down_write(&bdev_lookup_sem); down_write(&bdev_lookup_sem);
mutex_lock(&disk->part0->bd_mutex);
blk_drop_partitions(disk); blk_drop_partitions(disk);
mutex_unlock(&disk->part0->bd_mutex);
fsync_bdev(disk->part0); fsync_bdev(disk->part0);
__invalidate_device(disk->part0, true); __invalidate_device(disk->part0, true);

2
block/partitions/core.c
View file

@ -531,6 +531,8 @@ void blk_drop_partitions(struct gendisk *disk)
struct disk_part_iter piter; struct disk_part_iter piter;
struct block_device *part; struct block_device *part;
lockdep_assert_held(&disk->part0->bd_mutex);
disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY); disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY);
while ((part = disk_part_iter_next(&piter))) while ((part = disk_part_iter_next(&piter)))
delete_partition(part); delete_partition(part);