diff options
author | mav <mav@FreeBSD.org> | 2015-10-05 10:36:28 +0000 |
---|---|---|
committer | mav <mav@FreeBSD.org> | 2015-10-05 10:36:28 +0000 |
commit | 2da4219a54809b45e73b23decdffb6a381677fcd (patch) | |
tree | 9cac2e28eab76dbeebacecc42caabc29e066fcb7 /sys/cam | |
parent | 142a2e48fefde2903499d2f23f996bd7eff88d7b (diff) | |
download | FreeBSD-src-2da4219a54809b45e73b23decdffb6a381677fcd.zip FreeBSD-src-2da4219a54809b45e73b23decdffb6a381677fcd.tar.gz |
MFC r287933: Replicate port->init_devid to HA peer.
Diffstat (limited to 'sys/cam')
-rw-r--r-- | sys/cam/ctl/ctl.c | 27 | ||||
-rw-r--r-- | sys/cam/ctl/ctl_io.h | 1 |
2 files changed, 26 insertions, 2 deletions
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index ed1c40a..8f1ef5f 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -613,6 +613,8 @@ ctl_isc_announce_port(struct ctl_port *port) i += port->port_devid->len; if (port->target_devid) i += port->target_devid->len; + if (port->init_devid) + i += port->init_devid->len; msg = malloc(i, M_CTL, M_WAITOK); bzero(&msg->port, sizeof(msg->port)); msg->hdr.msg_type = CTL_MSG_PORT_SYNC; @@ -643,6 +645,12 @@ ctl_isc_announce_port(struct ctl_port *port) msg->port.target_devid_len); i += msg->port.target_devid_len; } + if (port->init_devid) { + msg->port.init_devid_len = port->init_devid->len; + memcpy(&msg->port.data[i], port->init_devid->data, + msg->port.init_devid_len); + i += msg->port.init_devid_len; + } ctl_ha_msg_send(CTL_HA_CHAN_CTL, &msg->port, sizeof(msg->port) + i, M_WAITOK); free(msg, M_CTL); @@ -867,8 +875,23 @@ ctl_isc_port_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) port->target_devid->len = msg->port.target_devid_len; i += msg->port.target_devid_len; } else { - free(port->port_devid, M_CTL); - port->port_devid = NULL; + free(port->target_devid, M_CTL); + port->target_devid = NULL; + } + if (msg->port.init_devid_len != 0) { + if (port->init_devid == NULL || + port->init_devid->len != msg->port.init_devid_len) { + free(port->init_devid, M_CTL); + port->init_devid = malloc(sizeof(struct ctl_devid) + + msg->port.init_devid_len, M_CTL, M_WAITOK); + } + memcpy(port->init_devid->data, &msg->port.data[i], + msg->port.init_devid_len); + port->init_devid->len = msg->port.init_devid_len; + i += msg->port.init_devid_len; + } else { + free(port->init_devid, M_CTL); + port->init_devid = NULL; } if (new) { if (ctl_port_register(port) != 0) { diff --git a/sys/cam/ctl/ctl_io.h b/sys/cam/ctl/ctl_io.h index c92cf36..86aebc9 100644 --- a/sys/cam/ctl/ctl_io.h +++ b/sys/cam/ctl/ctl_io.h @@ -479,6 +479,7 @@ struct ctl_ha_msg_port { int lun_map_len; int port_devid_len; int target_devid_len; + int init_devid_len; uint8_t data[]; }; |