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

Commit c638830d authored by Andy Grover's avatar Andy Grover Committed by Nicholas Bellinger
Browse files

target: Don't return an error if disabling unsupported features 



If an attribute is present (but not yet supported) it should be OK
to write 0 (a no-op) to the attribute.

This is an issue because userspace should be able to save and restore all
set attribute values without error.

Signed-off-by: default avatarAndy Grover <agrover@redhat.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 65b0c78d

drivers/target/target_core_device.c

+16 −8
Original line number Diff line number Diff line
@@ -954,10 +954,14 @@ int se_dev_set_emulate_dpo(struct se_device *dev, int flag) 
		return -EINVAL;

	}



	if (flag) {

		pr_err("dpo_emulated not supported\n");

		return -EINVAL;

	}



	return 0;

}



int se_dev_set_emulate_fua_write(struct se_device *dev, int flag)

{

	if (flag != 0 && flag != 1) {
@@ -965,7 +969,7 @@ int se_dev_set_emulate_fua_write(struct se_device *dev, int flag) 
		return -EINVAL;

	}



	if (dev->transport->fua_write_emulated == 0) {

	if (flag && dev->transport->fua_write_emulated == 0) {

		pr_err("fua_write_emulated not supported\n");

		return -EINVAL;

	}
@@ -982,17 +986,21 @@ int se_dev_set_emulate_fua_read(struct se_device *dev, int flag) 
		return -EINVAL;

	}



	if (flag) {

		pr_err("ua read emulated not supported\n");

		return -EINVAL;

	}



	return 0;

}



int se_dev_set_emulate_write_cache(struct se_device *dev, int flag)

{

	if (flag != 0 && flag != 1) {

		pr_err("Illegal value %d\n", flag);

		return -EINVAL;

	}

	if (dev->transport->write_cache_emulated == 0) {

	if (flag && dev->transport->write_cache_emulated == 0) {

		pr_err("write_cache_emulated not supported\n");

		return -EINVAL;

	}
@@ -1053,7 +1061,7 @@ int se_dev_set_emulate_tpu(struct se_device *dev, int flag) 
	 * We expect this value to be non-zero when generic Block Layer

	 * Discard supported is detected iblock_create_virtdevice().

	 */

	if (!dev->se_sub_dev->se_dev_attrib.max_unmap_block_desc_count) {

	if (flag && !dev->se_sub_dev->se_dev_attrib.max_unmap_block_desc_count) {

		pr_err("Generic Block Discard not supported\n");

		return -ENOSYS;

	}
@@ -1074,7 +1082,7 @@ int se_dev_set_emulate_tpws(struct se_device *dev, int flag) 
	 * We expect this value to be non-zero when generic Block Layer

	 * Discard supported is detected iblock_create_virtdevice().

	 */

	if (!dev->se_sub_dev->se_dev_attrib.max_unmap_block_desc_count) {

	if (flag && !dev->se_sub_dev->se_dev_attrib.max_unmap_block_desc_count) {

		pr_err("Generic Block Discard not supported\n");

		return -ENOSYS;

	}