[PATCH] block: don't add partitions if GD_SUPPRESS_PART_SCAN is set

[PATCH] block: don't add partitions if GD_SUPPRESS_PART_SCAN is set

[Ming Lei]

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 <ming.lei@redhat.com>
---
 block/partitions/core.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/block/partitions/core.c b/block/partitions/core.c
index fc1d70384825..b8112f52d388 100644
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -596,6 +596,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;
-- 
2.31.1

Re: [PATCH] block: don't add partitions if GD_SUPPRESS_PART_SCAN is set

[Christoph Hellwig]

On Tue, Aug 23, 2022 at 06:38:19PM +0800, Ming Lei wrote:
> 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 <ming.lei@redhat.com>

Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>

Re: [PATCH] block: don't add partitions if GD_SUPPRESS_PART_SCAN is set

[Ming Lei]

On Tue, Aug 23, 2022 at 06:38:19PM +0800, Ming Lei wrote:
> 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 <ming.lei@redhat.com>

Hello Jens,

Any chance to merge this patch to v6.0?

Thanks,
Ming

Re: [PATCH] block: don't add partitions if GD_SUPPRESS_PART_SCAN is set

[Jens Axboe]

On Tue, 23 Aug 2022 18:38:19 +0800, Ming Lei wrote:
> 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.
> 
> [...]

Applied, thanks!

[1/1] block: don't add partitions if GD_SUPPRESS_PART_SCAN is set
      commit: 748008e1da926a814cc0a054c81ca614408b1b0c

Best regards,
-- 
Jens Axboe