From 4c9a8adb14d2a6b2f005db6b1cc68bd4492ed0e6 Mon Sep 17 00:00:00 2001 From: Ming Lei Date: Tue, 23 Aug 2022 18:38:19 +0800 Subject: [PATCH] block: don't add partitions if GD_SUPPRESS_PART_SCAN is set [ Upstream commit 748008e1da926a814cc0a054c81ca614408b1b0c ] Commit b9684a71fca7 ("block, loop: support partitions without scanning") adds GD_SUPPRESS_PART_SCAN for replacing part function of GENHD_FL_NO_PART. But looks blk_add_partitions() is missed, since loop doesn't want to add partitions if GENHD_FL_NO_PART was set. And it causes regression on libblockdev (as called from udisks) which operates with the LO_FLAGS_PARTSCAN. Fixes the issue by not adding partitions if GD_SUPPRESS_PART_SCAN is set. Fixes: b9684a71fca7 ("block, loop: support partitions without scanning") Signed-off-by: Ming Lei Reviewed-by: Christoph Hellwig Link: https://lore.kernel.org/r/20220823103819.395776-1-ming.lei@redhat.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/partitions/core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block/partitions/core.c b/block/partitions/core.c index 8a0ec929023bc..76617b1d2d47f 100644 --- a/block/partitions/core.c +++ b/block/partitions/core.c @@ -597,6 +597,9 @@ static int blk_add_partitions(struct gendisk *disk) if (disk->flags & GENHD_FL_NO_PART) return 0; + if (test_bit(GD_SUPPRESS_PART_SCAN, &disk->state)) + return 0; + state = check_partition(disk); if (!state) return 0;