Commit 6906d008 authored by Mike Christie's avatar Mike Christie Committed by Nicholas Bellinger

xcopy: loop over devices using idr helper

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>
parent b1943fd4
...@@ -55,48 +55,60 @@ static int target_xcopy_gen_naa_ieee(struct se_device *dev, unsigned char *buf) ...@@ -55,48 +55,60 @@ static int target_xcopy_gen_naa_ieee(struct se_device *dev, unsigned char *buf)
return 0; return 0;
} }
static int target_xcopy_locate_se_dev_e4(const unsigned char *dev_wwn, struct xcopy_dev_search_info {
struct se_device **found_dev) 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]; unsigned char tmp_dev_wwn[XCOPY_NAA_IEEE_REGEX_LEN];
int rc; int rc;
mutex_lock(&g_device_mutex); if (!se_dev->dev_attrib.emulate_3pc)
list_for_each_entry(se_dev, &g_device_list, g_dev_node) { return 0;
if (!se_dev->dev_attrib.emulate_3pc) memset(&tmp_dev_wwn[0], 0, XCOPY_NAA_IEEE_REGEX_LEN);
continue; target_xcopy_gen_naa_ieee(se_dev, &tmp_dev_wwn[0]);
memset(&tmp_dev_wwn[0], 0, XCOPY_NAA_IEEE_REGEX_LEN); rc = memcmp(&tmp_dev_wwn[0], info->dev_wwn, XCOPY_NAA_IEEE_REGEX_LEN);
target_xcopy_gen_naa_ieee(se_dev, &tmp_dev_wwn[0]); if (rc != 0)
return 0;
rc = memcmp(&tmp_dev_wwn[0], dev_wwn, XCOPY_NAA_IEEE_REGEX_LEN); info->found_dev = se_dev;
if (rc != 0) pr_debug("XCOPY 0xe4: located se_dev: %p\n", se_dev);
continue;
*found_dev = se_dev; rc = target_depend_item(&se_dev->dev_group.cg_item);
pr_debug("XCOPY 0xe4: located se_dev: %p\n", se_dev); if (rc != 0) {
pr_err("configfs_depend_item attempt failed: %d for se_dev: %p\n",
rc, se_dev);
return rc;
}
rc = target_depend_item(&se_dev->dev_group.cg_item); pr_debug("Called configfs_depend_item for se_dev: %p se_dev->se_dev_group: %p\n",
if (rc != 0) { se_dev, &se_dev->dev_group);
pr_err("configfs_depend_item attempt failed:" return 1;
" %d for se_dev: %p\n", rc, se_dev); }
mutex_unlock(&g_device_mutex);
return rc; 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;
pr_debug("Called configfs_depend_item for se_dev: %p" memset(&info, 0, sizeof(info));
" se_dev->se_dev_group: %p\n", se_dev, info.dev_wwn = dev_wwn;
&se_dev->dev_group);
mutex_unlock(&g_device_mutex); ret = target_for_each_device(target_xcopy_locate_se_dev_e4_iter, &info);
if (ret == 1) {
*found_dev = info.found_dev;
return 0; return 0;
} else {
pr_debug_ratelimited("Unable to locate 0xe4 descriptor for EXTENDED_COPY\n");
return -EINVAL;
} }
mutex_unlock(&g_device_mutex);
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, static int target_xcopy_parse_tiddesc_e4(struct se_cmd *se_cmd, struct xcopy_op *xop,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment