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

Commit 0605fa6d authored by Mike Snitzer's avatar Mike Snitzer Committed by Greg Kroah-Hartman
Browse files

dm: set QUEUE_FLAG_DAX accordingly in dm_table_set_restrictions() 



commit ad3793fc upstream.

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>
Signed-off-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3729e556

drivers/md/dm-table.c

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

	}

	blk_queue_write_cache(q, wc, fua);

	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))

	if (dm_table_supports_dax_write_cache(t))

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

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

drivers/md/dm.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -2050,9 +2050,6 @@ int dm_setup_md_queue(struct mapped_device *md, struct dm_table *t) 
		 */

		 */

		bioset_free(md->queue->bio_split);

		bioset_free(md->queue->bio_split);

		md->queue->bio_split = NULL;

		md->queue->bio_split = NULL;



		if (type == DM_TYPE_DAX_BIO_BASED)

			queue_flag_set_unlocked(QUEUE_FLAG_DAX, md->queue);

		break;

		break;

	case DM_TYPE_NONE:

	case DM_TYPE_NONE:

		WARN_ON_ONCE(true);

		WARN_ON_ONCE(true);