Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fdee212 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove QUEUE_FLAG_STACKABLE 



We already have a queue_is_rq_based helper to check if a request_queue
is request based, so we can remove the flag for it.

Acked-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b35bd0d9

block/blk-mq-debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ static const char *const blk_queue_flag_name[] = { 
	QUEUE_FLAG_NAME(NOMERGES),

	QUEUE_FLAG_NAME(SAME_COMP),

	QUEUE_FLAG_NAME(FAIL_IO),

	QUEUE_FLAG_NAME(STACKABLE),

	QUEUE_FLAG_NAME(NONROT),

	QUEUE_FLAG_NAME(IO_STAT),

	QUEUE_FLAG_NAME(DISCARD),

block/elevator.c

+1 −1
Original line number Diff line number Diff line
@@ -1118,7 +1118,7 @@ ssize_t elv_iosched_show(struct request_queue *q, char *name) 
	struct elevator_type *__e;

	int len = 0;



	if (!blk_queue_stackable(q))

	if (!queue_is_rq_based(q))

		return sprintf(name, "none\n");



	if (!q->elevator)

drivers/md/dm-rq.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static unsigned dm_get_blk_mq_queue_depth(void) 


int dm_request_based(struct mapped_device *md)

{

	return blk_queue_stackable(md->queue);

	return queue_is_rq_based(md->queue);

}



static void dm_old_start_queue(struct request_queue *q)

drivers/md/dm-table.c

+1 −14
Original line number Diff line number Diff line
@@ -1000,7 +1000,7 @@ static int dm_table_determine_type(struct dm_table *t) 
	list_for_each_entry(dd, devices, list) {

		struct request_queue *q = bdev_get_queue(dd->dm_dev->bdev);



		if (!blk_queue_stackable(q)) {

		if (!queue_is_rq_based(q)) {

			DMERR("table load rejected: including"

			      " non-request-stackable devices");

			return -EINVAL;
@@ -1847,19 +1847,6 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q, 
	 */

	if (blk_queue_add_random(q) && dm_table_all_devices_attribute(t, device_is_not_random))

		queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, q);



	/*

	 * QUEUE_FLAG_STACKABLE must be set after all queue settings are

	 * visible to other CPUs because, once the flag is set, incoming bios

	 * are processed by request-based dm, which refers to the queue

	 * settings.

	 * Until the flag set, bios are passed to bio-based dm and queued to

	 * md->deferred where queue settings are not needed yet.

	 * Those bios are passed to request-based dm at the resume time.

	 */

	smp_mb();

	if (dm_table_request_based(t))

		queue_flag_set_unlocked(QUEUE_FLAG_STACKABLE, q);

}



unsigned int dm_table_get_num_targets(struct dm_table *t)

drivers/md/dm.c

+0 −11
Original line number Diff line number Diff line
@@ -1612,17 +1612,6 @@ static void dm_wq_work(struct work_struct *work); 


void dm_init_md_queue(struct mapped_device *md)

{

	/*

	 * Request-based dm devices cannot be stacked on top of bio-based dm

	 * devices.  The type of this dm device may not have been decided yet.

	 * The type is decided at the first table loading time.

	 * To prevent problematic device stacking, clear the queue flag

	 * for request stacking support until then.

	 *

	 * This queue is new, so no concurrency on the queue_flags.

	 */

	queue_flag_clear_unlocked(QUEUE_FLAG_STACKABLE, md->queue);



	/*

	 * Initialize data that will only be used by a non-blk-mq DM queue

	 * - must do so here (in alloc_dev callchain) before queue is used