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

Commit 34ca8e54 authored by Mike Christie's avatar Mike Christie Committed by Greg Kroah-Hartman
Browse files

xcopy: loop over devices using idr helper 



[ Upstream commit 6906d008b4b06e42cad393ac25bec76fbf31fabd ]

This converts the xcopy code to use the idr helper. The next patch
will drop the g_device_list and make g_device_mutex local to the
target_core_device.c file.

Signed-off-by: default avatarMike Christie <mchristi@redhat.com>
Reviewed-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a11bd997

drivers/target/target_core_xcopy.c

+41 −29
Original line number Diff line number Diff line
@@ -52,49 +52,61 @@ static int target_xcopy_gen_naa_ieee(struct se_device *dev, unsigned char *buf) 
	return 0;

}



static int target_xcopy_locate_se_dev_e4(const unsigned char *dev_wwn,

					struct se_device **found_dev)

struct xcopy_dev_search_info {

	const unsigned char *dev_wwn;

	struct se_device *found_dev;

};



static int target_xcopy_locate_se_dev_e4_iter(struct se_device *se_dev,

					      void *data)

{

	struct se_device *se_dev;

	struct xcopy_dev_search_info *info = data;

	unsigned char tmp_dev_wwn[XCOPY_NAA_IEEE_REGEX_LEN];

	int rc;



	mutex_lock(&g_device_mutex);

	list_for_each_entry(se_dev, &g_device_list, g_dev_node) {



	if (!se_dev->dev_attrib.emulate_3pc)

			continue;

		return 0;



	memset(&tmp_dev_wwn[0], 0, XCOPY_NAA_IEEE_REGEX_LEN);

	target_xcopy_gen_naa_ieee(se_dev, &tmp_dev_wwn[0]);



		rc = memcmp(&tmp_dev_wwn[0], dev_wwn, XCOPY_NAA_IEEE_REGEX_LEN);

	rc = memcmp(&tmp_dev_wwn[0], info->dev_wwn, XCOPY_NAA_IEEE_REGEX_LEN);

	if (rc != 0)

			continue;

		return 0;



		*found_dev = se_dev;

	info->found_dev = se_dev;

	pr_debug("XCOPY 0xe4: located se_dev: %p\n", se_dev);



	rc = target_depend_item(&se_dev->dev_group.cg_item);

	if (rc != 0) {

			pr_err("configfs_depend_item attempt failed:"

				" %d for se_dev: %p\n", rc, se_dev);

			mutex_unlock(&g_device_mutex);

		pr_err("configfs_depend_item attempt failed: %d for se_dev: %p\n",

		       rc, se_dev);

		return rc;

	}



		pr_debug("Called configfs_depend_item for se_dev: %p"

			" se_dev->se_dev_group: %p\n", se_dev,

			&se_dev->dev_group);



		mutex_unlock(&g_device_mutex);

		return 0;

	pr_debug("Called configfs_depend_item for se_dev: %p se_dev->se_dev_group: %p\n",

		 se_dev, &se_dev->dev_group);

	return 1;

}

	mutex_unlock(&g_device_mutex);



static int target_xcopy_locate_se_dev_e4(const unsigned char *dev_wwn,

					struct se_device **found_dev)

{

	struct xcopy_dev_search_info info;

	int ret;



	memset(&info, 0, sizeof(info));

	info.dev_wwn = dev_wwn;



	ret = target_for_each_device(target_xcopy_locate_se_dev_e4_iter, &info);

	if (ret == 1) {

		*found_dev = info.found_dev;

		return 0;

	} else {

		pr_debug_ratelimited("Unable to locate 0xe4 descriptor for EXTENDED_COPY\n");

		return -EINVAL;

	}

}



static int target_xcopy_parse_tiddesc_e4(struct se_cmd *se_cmd, struct xcopy_op *xop,

				unsigned char *p, unsigned short cscd_index)