summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-11-14 15:34:33 +0100
committerJens Axboe <axboe@kernel.dk>2019-11-14 07:42:41 -0700
commit6917d0689993f46d97d40dd66c601d0fd5b1dbdd (patch)
tree176dd2f6fa009a8ab3bd5181afc2f3ed71888e21 /block
parentf902b02600028dfc0c9df811eb711ac7d7fca09f (diff)
downloadlinux-6917d0689993f46d97d40dd66c601d0fd5b1dbdd.tar.bz2
block: merge invalidate_partitions into rescan_partitions
A lot of the logic in invalidate_partitions and rescan_partitions is shared. Merge the two functions to simplify things. There is a small behavior change in that we now send the kevent change notice also if we were not invalidating but no partitions were found, which seems like the right thing to do. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/ioctl.c2
-rw-r--r--block/partition-generic.c38
2 files changed, 15 insertions, 25 deletions
diff --git a/block/ioctl.c b/block/ioctl.c
index 8756efb1419e..f6576a6d5778 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -171,7 +171,7 @@ int __blkdev_reread_part(struct block_device *bdev)
lockdep_assert_held(&bdev->bd_mutex);
- return rescan_partitions(disk, bdev);
+ return rescan_partitions(disk, bdev, false);
}
EXPORT_SYMBOL(__blkdev_reread_part);
diff --git a/block/partition-generic.c b/block/partition-generic.c
index 7eabb67f99b5..6b9f4f5d993a 100644
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -576,7 +576,8 @@ out_free_state:
return ret;
}
-int rescan_partitions(struct gendisk *disk, struct block_device *bdev)
+int rescan_partitions(struct gendisk *disk, struct block_device *bdev,
+ bool invalidate)
{
int ret;
@@ -585,13 +586,22 @@ rescan:
if (ret)
return ret;
- if (disk->fops->revalidate_disk)
+ if (invalidate)
+ set_capacity(disk, 0);
+ else if (disk->fops->revalidate_disk)
disk->fops->revalidate_disk(disk);
- check_disk_size_change(disk, bdev, true);
+
+ check_disk_size_change(disk, bdev, !invalidate);
bdev->bd_invalidated = 0;
- if (!get_capacity(disk))
+ if (!get_capacity(disk)) {
+ /*
+ * Tell userspace that the media / partition table may have
+ * changed.
+ */
+ kobject_uevent(&disk_to_dev(disk)->kobj, KOBJ_CHANGE);
return 0;
+ }
ret = blk_add_partitions(disk, bdev);
if (ret == -EAGAIN)
@@ -599,26 +609,6 @@ rescan:
return ret;
}
-int invalidate_partitions(struct gendisk *disk, struct block_device *bdev)
-{
- int res;
-
- if (!bdev->bd_invalidated)
- return 0;
-
- res = drop_partitions(disk, bdev);
- if (res)
- return res;
-
- set_capacity(disk, 0);
- check_disk_size_change(disk, bdev, false);
- bdev->bd_invalidated = 0;
- /* tell userspace that the media / partition table may have changed */
- kobject_uevent(&disk_to_dev(disk)->kobj, KOBJ_CHANGE);
-
- return 0;
-}
-
unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
{
struct address_space *mapping = bdev->bd_inode->i_mapping;