diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:35:39 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:35:39 +0000 |
| commit | ddbb0c19fe8ea90e33ad47299c7edd6305d0eaea (patch) | |
| tree | de36f79327a07773a125f713f423457a88104e56 /block/partitions | |
| parent | Adding debian version 6.8.9-1. (diff) | |
| download | linux-ddbb0c19fe8ea90e33ad47299c7edd6305d0eaea.tar.xz linux-ddbb0c19fe8ea90e33ad47299c7edd6305d0eaea.zip | |
Merging upstream version 6.8.11.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'block/partitions')
| -rw-r--r-- | block/partitions/core.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/block/partitions/core.c b/block/partitions/core.c index 5f5ed5c75f..eac887755f 100644 --- a/block/partitions/core.c +++ b/block/partitions/core.c @@ -584,10 +584,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); |