From: He Zhe <[email protected]>
This reverts commit 6917d0689993f46d97d40dd66c601d0fd5b1dbdd.
---
block/ioctl.c | 2 +-
block/partition-generic.c | 38 ++++++++++++++++++++++++--------------
fs/block_dev.c | 5 ++++-
include/linux/genhd.h | 4 ++--
4 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/block/ioctl.c b/block/ioctl.c
index f5d75ba9ceb4..f5565dd6bf2a 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, false);
+ return rescan_partitions(disk, bdev);
}
EXPORT_SYMBOL(__blkdev_reread_part);
diff --git a/block/partition-generic.c b/block/partition-generic.c
index c0f28eaf54f6..81430b317379 100644
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -597,8 +597,7 @@ static int blk_add_partitions(struct gendisk *disk, struct
block_device *bdev)
return ret;
}
-int rescan_partitions(struct gendisk *disk, struct block_device *bdev,
- bool invalidate)
+int rescan_partitions(struct gendisk *disk, struct block_device *bdev)
{
int ret;
@@ -607,22 +606,13 @@ int rescan_partitions(struct gendisk *disk, struct
block_device *bdev,
if (ret)
return ret;
- if (invalidate)
- set_capacity(disk, 0);
- else if (disk->fops->revalidate_disk)
+ if (disk->fops->revalidate_disk)
disk->fops->revalidate_disk(disk);
-
- check_disk_size_change(disk, bdev, !invalidate);
+ check_disk_size_change(disk, bdev, true);
bdev->bd_invalidated = 0;
- if (!get_capacity(disk)) {
- /*
- * Tell userspace that the media / partition table may have
- * changed.
- */
- kobject_uevent(&disk_to_dev(disk)->kobj, KOBJ_CHANGE);
+ if (!get_capacity(disk))
return 0;
- }
ret = blk_add_partitions(disk, bdev);
if (ret == -EAGAIN)
@@ -630,6 +620,26 @@ int rescan_partitions(struct gendisk *disk, struct
block_device *bdev,
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;
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 0af62b76d031..d612468ee66b 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1511,7 +1511,10 @@ static void __blkdev_put(struct block_device *bdev,
fmode_t mode, int for_part);
static void bdev_disk_changed(struct block_device *bdev, bool invalidate)
{
if (disk_part_scan_enabled(bdev->bd_disk)) {
- rescan_partitions(bdev->bd_disk, bdev, invalidate);
+ if (invalidate)
+ invalidate_partitions(bdev->bd_disk, bdev);
+ else
+ rescan_partitions(bdev->bd_disk, bdev);
} else {
check_disk_size_change(bdev->bd_disk, bdev, !invalidate);
bdev->bd_invalidated = 0;
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index e661120c5b14..0ac379b10d45 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -634,8 +634,8 @@ extern dev_t blk_lookup_devt(const char *name, int partno);
extern char *disk_name (struct gendisk *hd, int partno, char *buf);
extern int disk_expand_part_tbl(struct gendisk *disk, int target);
-int rescan_partitions(struct gendisk *disk, struct block_device *bdev,
- bool invalidate);
+extern int rescan_partitions(struct gendisk *disk, struct block_device *bdev);
+extern int invalidate_partitions(struct gendisk *disk, struct block_device
*bdev);
extern struct hd_struct * __must_check add_partition(struct gendisk *disk,
int partno, sector_t start,
sector_t len, int flags,
--
2.24.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8443):
https://lists.yoctoproject.org/g/linux-yocto/message/8443
Mute This Topic: https://lists.yoctoproject.org/mt/71728976/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
