Commit 8b904b5b authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

block: Use blk_queue_flag_*() in drivers instead of queue_flag_*() 



This patch has been generated as follows:

for verb in set_unlocked clear_unlocked set clear; do
  replace-in-files queue_flag_${verb} blk_queue_flag_${verb%_unlocked} \
    $(git grep -lw queue_flag_${verb} drivers block/bsg*)
done

Except for protecting all queue flag changes with the queue lock
this patch does not change any functionality.

Cc: Mike Snitzer <snitzer@redhat.com>
Cc: Shaohua Li <shli@fb.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Ming Lei <ming.lei@redhat.com>
Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Acked-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent bf3a2b31

block/bsg-lib.c

+2 −2
Original line number Diff line number Diff line
@@ -275,8 +275,8 @@ struct request_queue *bsg_setup_queue(struct device *dev, const char *name, 


	q->queuedata = dev;

	q->bsg_job_fn = job_fn;

	queue_flag_set_unlocked(QUEUE_FLAG_BIDI, q);

	queue_flag_set_unlocked(QUEUE_FLAG_SCSI_PASSTHROUGH, q);

	blk_queue_flag_set(QUEUE_FLAG_BIDI, q);

	blk_queue_flag_set(QUEUE_FLAG_SCSI_PASSTHROUGH, q);

	blk_queue_softirq_done(q, bsg_softirq_done);

	blk_queue_rq_timeout(q, BLK_DEFAULT_SG_TIMEOUT);

drivers/block/drbd/drbd_nl.c

+2 −2
Original line number Diff line number Diff line
@@ -1212,10 +1212,10 @@ static void decide_on_discard_support(struct drbd_device *device, 
		 * topology on all peers. */

		blk_queue_discard_granularity(q, 512);

		q->limits.max_discard_sectors = drbd_max_discard_sectors(connection);

		queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);

		blk_queue_flag_set(QUEUE_FLAG_DISCARD, q);

		q->limits.max_write_zeroes_sectors = drbd_max_discard_sectors(connection);

	} else {

		queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, q);

		blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q);

		blk_queue_discard_granularity(q, 0);

		q->limits.max_discard_sectors = 0;

		q->limits.max_write_zeroes_sectors = 0;

drivers/block/loop.c

+5 −5
Original line number Diff line number Diff line
@@ -214,10 +214,10 @@ static void __loop_update_dio(struct loop_device *lo, bool dio) 
	blk_mq_freeze_queue(lo->lo_queue);

	lo->use_dio = use_dio;

	if (use_dio) {

		queue_flag_clear_unlocked(QUEUE_FLAG_NOMERGES, lo->lo_queue);

		blk_queue_flag_clear(QUEUE_FLAG_NOMERGES, lo->lo_queue);

		lo->lo_flags |= LO_FLAGS_DIRECT_IO;

	} else {

		queue_flag_set_unlocked(QUEUE_FLAG_NOMERGES, lo->lo_queue);

		blk_queue_flag_set(QUEUE_FLAG_NOMERGES, lo->lo_queue);

		lo->lo_flags &= ~LO_FLAGS_DIRECT_IO;

	}

	blk_mq_unfreeze_queue(lo->lo_queue);
@@ -817,7 +817,7 @@ static void loop_config_discard(struct loop_device *lo) 
		q->limits.discard_alignment = 0;

		blk_queue_max_discard_sectors(q, 0);

		blk_queue_max_write_zeroes_sectors(q, 0);

		queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, q);

		blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q);

		return;

	}
@@ -826,7 +826,7 @@ static void loop_config_discard(struct loop_device *lo) 


	blk_queue_max_discard_sectors(q, UINT_MAX >> 9);

	blk_queue_max_write_zeroes_sectors(q, UINT_MAX >> 9);

	queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);

	blk_queue_flag_set(QUEUE_FLAG_DISCARD, q);

}



static void loop_unprepare_queue(struct loop_device *lo)
@@ -1808,7 +1808,7 @@ static int loop_add(struct loop_device **l, int i) 
	 * page. For directio mode, merge does help to dispatch bigger request

	 * to underlayer disk. We will enable merge once directio is enabled.

	 */

	queue_flag_set_unlocked(QUEUE_FLAG_NOMERGES, lo->lo_queue);

	blk_queue_flag_set(QUEUE_FLAG_NOMERGES, lo->lo_queue);



	err = -ENOMEM;

	disk = lo->lo_disk = alloc_disk(1 << part_shift);

drivers/block/nbd.c

+4 −4
Original line number Diff line number Diff line
@@ -964,7 +964,7 @@ static void nbd_parse_flags(struct nbd_device *nbd) 
	else

		set_disk_ro(nbd->disk, false);

	if (config->flags & NBD_FLAG_SEND_TRIM)

		queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, nbd->disk->queue);

		blk_queue_flag_set(QUEUE_FLAG_DISCARD, nbd->disk->queue);

	if (config->flags & NBD_FLAG_SEND_FLUSH) {

		if (config->flags & NBD_FLAG_SEND_FUA)

			blk_queue_write_cache(nbd->disk->queue, true, true);
@@ -1040,7 +1040,7 @@ static void nbd_config_put(struct nbd_device *nbd) 
		nbd->config = NULL;



		nbd->tag_set.timeout = 0;

		queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, nbd->disk->queue);

		blk_queue_flag_clear(QUEUE_FLAG_DISCARD, nbd->disk->queue);



		mutex_unlock(&nbd->config_lock);

		nbd_put(nbd);
@@ -1488,8 +1488,8 @@ static int nbd_dev_add(int index) 
	/*

	 * Tell the block layer that we are not a rotational device

	 */

	queue_flag_set_unlocked(QUEUE_FLAG_NONROT, disk->queue);

	queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, disk->queue);

	blk_queue_flag_set(QUEUE_FLAG_NONROT, disk->queue);

	blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, disk->queue);

	disk->queue->limits.discard_granularity = 512;

	blk_queue_max_discard_sectors(disk->queue, UINT_MAX);

	blk_queue_max_segment_size(disk->queue, UINT_MAX);

drivers/block/null_blk.c

+3 −3
Original line number Diff line number Diff line
@@ -1525,7 +1525,7 @@ static void null_config_discard(struct nullb *nullb) 
	nullb->q->limits.discard_granularity = nullb->dev->blocksize;

	nullb->q->limits.discard_alignment = nullb->dev->blocksize;

	blk_queue_max_discard_sectors(nullb->q, UINT_MAX >> 9);

	queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, nullb->q);

	blk_queue_flag_set(QUEUE_FLAG_DISCARD, nullb->q);

}



static int null_open(struct block_device *bdev, fmode_t mode)
@@ -1810,8 +1810,8 @@ static int null_add_dev(struct nullb_device *dev) 
	}



	nullb->q->queuedata = nullb;

	queue_flag_set_unlocked(QUEUE_FLAG_NONROT, nullb->q);

	queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, nullb->q);

	blk_queue_flag_set(QUEUE_FLAG_NONROT, nullb->q);

	blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, nullb->q);



	mutex_lock(&lock);

	nullb->index = ida_simple_get(&nullb_indexes, 0, 0, GFP_KERNEL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE