History

block: remove the disk argument from blk_drop_partitions

The gendisk can be trivially deducted from the block_device.

Christoph Hellwig committed 6 years ago

Commit d46430b1 parent 4377b483 files · +7 −7Browse files

Unified · Split

3 files
  1. block/partitions/core.c +5 −5
  2. fs/block_dev.c +1 −1
  3. include/linux/genhd.h +1 −1
block/partitions/core.c+5−5
@@ -603,23 +603,23 @@ static bool disk_unlock_native_capacity(struct gendisk *disk) · 602 unmodified lines
603 }603 }
604}604}
605 605
606int blk_drop_partitions(struct gendisk *disk, struct block_device *bdev)606int blk_drop_partitions(struct block_device *bdev)
607{607{
608 struct disk_part_iter piter;608 struct disk_part_iter piter;
609 struct hd_struct *part;609 struct hd_struct *part;
610 int res;610 int res;
611 611
612 if (!disk_part_scan_enabled(disk))612 if (!disk_part_scan_enabled(bdev->bd_disk))
613 return 0;613 return 0;
614 if (bdev->bd_part_count || bdev->bd_openers > 1)614 if (bdev->bd_part_count || bdev->bd_openers > 1)
615 return -EBUSY;615 return -EBUSY;
616 res = invalidate_partition(disk, 0);616 res = invalidate_partition(bdev->bd_disk, 0);
617 if (res)617 if (res)
618 return res;618 return res;
619 619
620 disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY);620 disk_part_iter_init(&piter, bdev->bd_disk, DISK_PITER_INCL_EMPTY);
621 while ((part = disk_part_iter_next(&piter)))621 while ((part = disk_part_iter_next(&piter)))
622 delete_partition(disk, part);622 delete_partition(bdev->bd_disk, part);
623 disk_part_iter_exit(&piter);623 disk_part_iter_exit(&piter);
624 624
625 return 0;625 return 0;
fs/block_dev.c+1−1
@@ -1517,7 +1517,7 @@ int bdev_disk_changed(struct block_device *bdev, bool invalidate) · 1516 unmodified lines
1517 lockdep_assert_held(&bdev->bd_mutex);1517 lockdep_assert_held(&bdev->bd_mutex);
1518 1518
1519rescan:1519rescan:
1520 ret = blk_drop_partitions(disk, bdev);1520 ret = blk_drop_partitions(bdev);
1521 if (ret)1521 if (ret)
1522 return ret;1522 return ret;
1523 1523
include/linux/genhd.h+1−1
@@ -339,7 +339,7 @@ extern dev_t blk_lookup_devt(const char *name, int partno); · 338 unmodified lines
339 339
340int bdev_disk_changed(struct block_device *bdev, bool invalidate);340int bdev_disk_changed(struct block_device *bdev, bool invalidate);
341int blk_add_partitions(struct gendisk *disk, struct block_device *bdev);341int blk_add_partitions(struct gendisk *disk, struct block_device *bdev);
342int blk_drop_partitions(struct gendisk *disk, struct block_device *bdev);342int blk_drop_partitions(struct block_device *bdev);
343extern void printk_all_partitions(void);343extern void printk_all_partitions(void);
344 344
345extern struct gendisk *__alloc_disk_node(int minors, int node_id);345extern struct gendisk *__alloc_disk_node(int minors, int node_id);