Skip to content

Commit

Permalink
block: don't add partitions if GD_SUPPRESS_PART_SCAN is set
Browse files Browse the repository at this point in the history
[ Upstream commit 748008e ]

Commit b9684a7 ("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: b9684a7 ("block, loop: support partitions without scanning")
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220823103819.395776-1-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Ming Lei authored and gregkh committed Sep 15, 2022
1 parent 26a6d7d commit 4c9a8ad
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions block/partitions/core.c
Expand Up @@ -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;
Expand Down

0 comments on commit 4c9a8ad

Please sign in to comment.