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

Commit ad3793fc authored by Mike Snitzer's avatar Mike Snitzer
Browse files

dm: set QUEUE_FLAG_DAX accordingly in dm_table_set_restrictions() 



Rather than having DAX support be unique by setting it based on table
type in dm_setup_md_queue().

Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 3d7f4562

drivers/md/dm-table.c

+2 −0
Original line number Diff line number Diff line
@@ -1823,6 +1823,8 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q, 
	}

	blk_queue_write_cache(q, wc, fua);



	if (dm_table_supports_dax(t))

		queue_flag_set_unlocked(QUEUE_FLAG_DAX, q);

	if (dm_table_supports_dax_write_cache(t))

		dax_write_cache(t->md->dax_dev, true);

drivers/md/dm.c

+0 −3
Original line number Diff line number Diff line
@@ -2034,9 +2034,6 @@ int dm_setup_md_queue(struct mapped_device *md, struct dm_table *t) 
	case DM_TYPE_DAX_BIO_BASED:

		dm_init_normal_md_queue(md);

		blk_queue_make_request(md->queue, dm_make_request);



		if (type == DM_TYPE_DAX_BIO_BASED)

			queue_flag_set_unlocked(QUEUE_FLAG_DAX, md->queue);

		break;

	case DM_TYPE_NONE:

		WARN_ON_ONCE(true);