block: pass a block_device to invalidate_partition (71773cf7) · Commits · 戴 / test

block/genhd.c

+3 −10

Original line number	Diff line number	Diff line
		@@ -803,14 +803,8 @@ void device_add_disk_no_queue_reg(struct device parent, struct gendisk disk)
		}
		EXPORT_SYMBOL(device_add_disk_no_queue_reg);

		static void invalidate_partition(struct gendisk *disk, int partno)
		static void invalidate_partition(struct block_device *bdev)
		{
		struct block_device *bdev;

		bdev = bdget_disk(disk, partno);
		if (!bdev)
		return;

		fsync_bdev(bdev);
		__invalidate_device(bdev, true);

		@@ -819,7 +813,6 @@ static void invalidate_partition(struct gendisk *disk, int partno)
		* up any more even if openers still hold references to it.
		*/
		remove_inode_hash(bdev->bd_inode);
		bdput(bdev);
		}

		/**
		@@ -864,12 +857,12 @@ void del_gendisk(struct gendisk *disk)
		disk_part_iter_init(&piter, disk,
		DISK_PITER_INCL_EMPTY \| DISK_PITER_REVERSE);
		while ((part = disk_part_iter_next(&piter))) {
		invalidate_partition(disk, part->bdev->bd_partno);
		invalidate_partition(part->bdev);
		delete_partition(part);
		}
		disk_part_iter_exit(&piter);

		invalidate_partition(disk, 0);
		invalidate_partition(disk->part0);
		set_capacity(disk, 0);
		disk->flags &= ~GENHD_FL_UP;
		up_write(&bdev_lookup_sem);