Merge tag 'for-6.10/block-20240511' of git://git.kernel.dk/linux

[thirdparty/kernel/linux.git] / block / partitions / core.c

diff --git a/block/partitions/core.c b/block/partitions/core.c
index b11e88c82c8cfa9e179b05a6633f0b1294d818da..37b5f92d07fec96d6b13e53b4194edbe938e4fcd 100644 (file)
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -573,10 +573,7 @@ static int blk_add_partitions(struct gendisk *disk)
        struct parsed_partitions *state;
        int ret = -EAGAIN, p;
 
-       if (disk->flags & GENHD_FL_NO_PART)
-               return 0;
-
-       if (test_bit(GD_SUPPRESS_PART_SCAN, &disk->state))
+       if (!disk_has_partscan(disk))
                return 0;
 
        state = check_partition(disk);