block/drivers: remove dead clear of random flag

QUEUE_FLAG_ADD_RANDOM is not set before we clear it for "null_blk",
"brd", "nbd", "zram", and "bcache" since by default we don't set
"QUEUE_FLAG_ADD_RANDOM" to MQ ops.

Remove dead clear of QUEUE_FLAG_ADD_RANDOM in above listed drivers.

Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org> #zram
Link: https://lore.kernel.org/r/20230424234628.45544-2-kch@nvidia.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 34177f1bd97dc09a4ccdd55f2ea1972f431d7e45..bcad9b926b0cd3a91ffab5089aaf6538669cc0f8 100644 (file)
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -404,7 +404,6 @@ static int brd_alloc(int i)
        /* Tell the block layer that this is not a rotational device */
        blk_queue_flag_set(QUEUE_FLAG_NONROT, disk->queue);
        blk_queue_flag_set(QUEUE_FLAG_SYNCHRONOUS, disk->queue);
-       blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, disk->queue);
        blk_queue_flag_set(QUEUE_FLAG_NOWAIT, disk->queue);
        err = add_disk(disk);
        if (err)

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index d445fd0934bd5d044906e9ebf232fbda385a0731..7c96ec4e99dfb090bbd242b2851d5e635fdf1287 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1805,7 +1805,6 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs)
         * Tell the block layer that we are not a rotational device
         */
        blk_queue_flag_set(QUEUE_FLAG_NONROT, disk->queue);
-       blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, disk->queue);
        disk->queue->limits.discard_granularity = 0;
        blk_queue_max_discard_sectors(disk->queue, 0);
        blk_queue_max_segment_size(disk->queue, UINT_MAX);

diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c
index fcb61f1d5437dc316746dac7ecaa53382cf99139..a60671a42de94ba9df2131c775f520d1d93ed0c8 100644 (file)
--- a/drivers/block/null_blk/main.c
+++ b/drivers/block/null_blk/main.c
@@ -2145,7 +2145,6 @@ static int null_add_dev(struct nullb_device *dev)
 
        nullb->q->queuedata = nullb;
        blk_queue_flag_set(QUEUE_FLAG_NONROT, nullb->q);
-       blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, nullb->q);
 
        mutex_lock(&lock);
        rv = ida_simple_get(&nullb_indexes, 0, 0, GFP_KERNEL);

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index aa490da3cef233409e2b85db33a7f8c88d3cba29..f7d4c0d5ad0d21381afe063b71a6b330ffa914f4 100644 (file)
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -2323,7 +2323,6 @@ static int zram_add(void)
        /* zram devices sort of resembles non-rotational disks */
        blk_queue_flag_set(QUEUE_FLAG_NONROT, zram->disk->queue);
        blk_queue_flag_set(QUEUE_FLAG_SYNCHRONOUS, zram->disk->queue);
-       blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, zram->disk->queue);
 
        /*
         * To ensure that we always get PAGE_SIZE aligned

diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index ba3909bb6beabb9d46217d34d5e13769d89ce8a3..7e9d19fd21ddd532c1bfcc68a3f0601e943d508f 100644 (file)
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -971,7 +971,6 @@ static int bcache_device_init(struct bcache_device *d, unsigned int block_size,
        }
 
        blk_queue_flag_set(QUEUE_FLAG_NONROT, d->disk->queue);
-       blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, d->disk->queue);
 
        blk_queue_write_cache(q, true, true);