Commit 3f89ac58 authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Jens Axboe
Browse files

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: default avatarChaitanya 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: default avatarJens Axboe <axboe@kernel.dk>
parent 38c8e3df

drivers/block/brd.c

+0 −1
Original line number Diff line number Diff line
@@ -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)

drivers/block/nbd.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/block/null_blk/main.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/block/zram/zram_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/md/bcache/super.c

+0 −1
Original line number Diff line number Diff line
@@ -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);