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

Commit b5ab4a9b authored by Toshi Kani's avatar Toshi Kani Committed by Mike Snitzer
Browse files

dm: allow bio-based table to be upgraded to bio-based with DAX support 



Allow table type DM_TYPE_BIO_BASED to extend with DM_TYPE_DAX_BIO_BASED
since DM_TYPE_DAX_BIO_BASED supports bio-based requests.

This is needed to allow a snapshot of an LV with DAX support to be
removed.  One of the intermediate table reloads that lvm2 does switches
from DM_TYPE_BIO_BASED to DM_TYPE_DAX_BIO_BASED.  No known reason to
disallow this so...

Signed-off-by: default avatarToshi Kani <toshi.kani@hpe.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent f6e629bd

drivers/md/dm-ioctl.c

+10 −1
Original line number Diff line number Diff line
@@ -1267,6 +1267,15 @@ static int populate_table(struct dm_table *table, 
	return dm_table_complete(table);

}



static bool is_valid_type(unsigned cur, unsigned new)

{

	if (cur == new ||

	    (cur == DM_TYPE_BIO_BASED && new == DM_TYPE_DAX_BIO_BASED))

		return true;



	return false;

}



static int table_load(struct dm_ioctl *param, size_t param_size)

{

	int r;
@@ -1309,7 +1318,7 @@ static int table_load(struct dm_ioctl *param, size_t param_size) 
			DMWARN("unable to set up device queue for new table.");

			goto err_unlock_md_type;

		}

	} else if (dm_get_md_type(md) != dm_table_get_type(t)) {

	} else if (!is_valid_type(dm_get_md_type(md), dm_table_get_type(t))) {

		DMWARN("can't change device type after initial table load.");

		r = -EINVAL;

		goto err_unlock_md_type;