nbd: Respect max_part for all partition scans

The creation path of the NBD device respects max_part and only scans for
partitions if max_part is not 0. However, some other code paths ignore
max_part, and unconditionally scan for partitions. Add a check for
max_part on each partition scan.

Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 92f84ed0ba9eb6eb4fc125eec0166b319e9fbfca..6727358e147dd8f8d3fb738951276f5881c20a66 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -318,7 +318,8 @@ static int nbd_set_size(struct nbd_device *nbd, loff_t bytesize,
        blk_queue_logical_block_size(nbd->disk->queue, blksize);
        blk_queue_physical_block_size(nbd->disk->queue, blksize);
 
-       set_bit(GD_NEED_PART_SCAN, &nbd->disk->state);
+       if (max_part)
+               set_bit(GD_NEED_PART_SCAN, &nbd->disk->state);
        if (!set_capacity_and_notify(nbd->disk, bytesize >> 9))
                kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE);
        return 0;
@@ -1476,9 +1477,11 @@ static int nbd_open(struct block_device *bdev, fmode_t mode)
                refcount_set(&nbd->config_refs, 1);
                refcount_inc(&nbd->refs);
                mutex_unlock(&nbd->config_lock);
-               set_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state);
+               if (max_part)
+                       set_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state);
        } else if (nbd_disconnected(nbd->config)) {
-               set_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state);
+               if (max_part)
+                       set_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state);
        }
 out:
        mutex_unlock(&nbd_index_mutex);