d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix assumptions of only one device per SES slot.

Browse Source 
It is typical to have one, but no longer true for multi-actuator HDDs
with separate LUN for each actuator.

MFC after:	4 days
Sponsored by:	iXsystems, Inc.
This commit is contained in:
Alexander Motin 2019-09-11 03:25:30 +00:00
parent 5b7145c6d4
commit 07f7e4c8b0
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/cam/cam_periph.c
View File

@ -402,7 +402,9 @@ cam_periph_list(struct cam_path *path, struct sbuf *sb)
} }
xpt_unlock_buses(); xpt_unlock_buses();
sbuf_finish(&local_sb); sbuf_finish(&local_sb);
sbuf_cpy(sb, sbuf_data(&local_sb)); if (sbuf_len(sb) != 0)
sbuf_cat(sb, ",");
sbuf_cat(sb, sbuf_data(&local_sb));
sbuf_delete(&local_sb); sbuf_delete(&local_sb);
return (count); return (count);
} }

32
sys/cam/scsi/scsi_enc_ses.c
View File

@ -883,6 +883,7 @@ ses_path_iter_devid_callback(enc_softc_t *enc, enc_element_t *elem,
struct device_match_result *device_match; struct device_match_result *device_match;
struct device_match_pattern *device_pattern; struct device_match_pattern *device_pattern;
ses_path_iter_args_t *args; ses_path_iter_args_t *args;
struct cam_path *path;
args = (ses_path_iter_args_t *)arg; args = (ses_path_iter_args_t *)arg;
match_pattern.type = DEV_MATCH_DEVICE; match_pattern.type = DEV_MATCH_DEVICE;
@ -908,23 +909,26 @@ ses_path_iter_devid_callback(enc_softc_t *enc, enc_element_t *elem,
cdm.match_buf_len = sizeof(match_result); cdm.match_buf_len = sizeof(match_result);
cdm.matches = &match_result; cdm.matches = &match_result;
xpt_action((union ccb *)&cdm); do {
xpt_free_path(cdm.ccb_h.path); xpt_action((union ccb *)&cdm);
if ((cdm.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP if ((cdm.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP ||
|| (cdm.status != CAM_DEV_MATCH_LAST (cdm.status != CAM_DEV_MATCH_LAST &&
&& cdm.status != CAM_DEV_MATCH_MORE) cdm.status != CAM_DEV_MATCH_MORE) ||
|| cdm.num_matches == 0) cdm.num_matches == 0)
return; break;
device_match = &match_result.result.device_result; device_match = &match_result.result.device_result;
if (xpt_create_path(&cdm.ccb_h.path, /*periph*/NULL, if (xpt_create_path(&path, /*periph*/NULL,
device_match->path_id, device_match->path_id,
device_match->target_id, device_match->target_id,
device_match->target_lun) != CAM_REQ_CMP) device_match->target_lun) == CAM_REQ_CMP) {
return;
args->callback(enc, elem, cdm.ccb_h.path, args->callback_arg); args->callback(enc, elem, path, args->callback_arg);
xpt_free_path(path);
}
} while (cdm.status == CAM_DEV_MATCH_MORE);
xpt_free_path(cdm.ccb_h.path); xpt_free_path(cdm.ccb_h.path);
} }