38c38
< __FBSDID("$FreeBSD: stable/10/usr.sbin/ctld/kernel.c 279003 2015-02-19 14:33:46Z mav $");
---
> __FBSDID("$FreeBSD: stable/10/usr.sbin/ctld/kernel.c 279006 2015-02-19 14:52:01Z mav $");
124c124
< int cfiscsi_status;
---
> int cfiscsi_state;
126a127
> char *ctld_portal_group_name;
335,336c336,337
< } else if (strcmp(name, "cfiscsi_status") == 0) {
< cur_port->cfiscsi_status = strtoul(str, NULL, 0);
---
> } else if (strcmp(name, "cfiscsi_state") == 0) {
> cur_port->cfiscsi_state = strtoul(str, NULL, 0);
338a340,342
> } else if (strcmp(name, "ctld_portal_group_name") == 0) {
> cur_port->ctld_portal_group_name = str;
> str = NULL;
375a380,381
> struct portal_group *pg;
> struct port *cp;
499c505
< if (port->cfiscsi_status != 1) {
---
> if (port->cfiscsi_state != 1) {
501c507
< (uintmax_t)port->port_id, port->cfiscsi_status);
---
> (uintmax_t)port->port_id, port->cfiscsi_state);
516a523,544
>
> if (port->ctld_portal_group_name == NULL)
> continue;
> pg = portal_group_find(conf, port->ctld_portal_group_name);
> if (pg == NULL) {
> #if 0
> log_debugx("found new kernel portal group %s for CTL port %ld",
> port->ctld_portal_group_name, port->port_id);
> #endif
> pg = portal_group_new(conf, port->ctld_portal_group_name);
> if (pg == NULL) {
> log_warnx("portal_group_new failed");
> continue;
> }
> }
> pg->pg_tag = port->cfiscsi_portal_group_tag;
> cp = port_new(conf, targ, pg);
> if (cp == NULL) {
> log_warnx("port_new failed");
> continue;
> }
> cp->p_ctl_port = port->port_id;
807c835
< kernel_port_add(struct target *targ)
---
> kernel_port_add(struct port *port)
811a840,841
> struct target *targ = port->p_target;
> struct portal_group *pg = port->p_portal_group;
813c843
< int error, i;
---
> int error, i, n;
819d848
< req.num_args = 4;
821,828c850,858
< req.args[0].namelen = sizeof("port_id");
< req.args[0].name = __DECONST(char *, "port_id");
< req.args[0].vallen = sizeof(targ->t_ctl_port);
< req.args[0].value = &targ->t_ctl_port;
< req.args[0].flags = CTL_BEARG_WR;
< str_arg(&req.args[1], "cfiscsi_target", targ->t_name);
< snprintf(tagstr, sizeof(tagstr), "%d", targ->t_portal_group->pg_tag);
< str_arg(&req.args[2], "cfiscsi_portal_group_tag", tagstr);
---
> n = 0;
> req.args[n].namelen = sizeof("port_id");
> req.args[n].name = __DECONST(char *, "port_id");
> req.args[n].vallen = sizeof(port->p_ctl_port);
> req.args[n].value = &port->p_ctl_port;
> req.args[n++].flags = CTL_BEARG_WR;
> str_arg(&req.args[n++], "cfiscsi_target", targ->t_name);
> snprintf(tagstr, sizeof(tagstr), "%d", pg->pg_tag);
> str_arg(&req.args[n++], "cfiscsi_portal_group_tag", tagstr);
830,832c860,862
< str_arg(&req.args[3], "cfiscsi_target_alias", targ->t_alias);
< else
< req.num_args--;
---
> str_arg(&req.args[n++], "cfiscsi_target_alias", targ->t_alias);
> str_arg(&req.args[n++], "ctld_portal_group_name", pg->pg_name);
> req.num_args = n;
851c881
< lm.port = targ->t_ctl_port;
---
> lm.port = port->p_ctl_port;
862c892
< lm.port = targ->t_ctl_port;
---
> lm.port = port->p_ctl_port;
872c902
< entry.targ_port = targ->t_ctl_port;
---
> entry.targ_port = port->p_ctl_port;
883c913
< kernel_port_update(struct target *targ)
---
> kernel_port_update(struct port *port)
885a916
> struct target *targ = port->p_target;
890c921
< lm.port = targ->t_ctl_port;
---
> lm.port = port->p_ctl_port;
904c935
< kernel_port_remove(struct target *targ)
---
> kernel_port_remove(struct port *port)
907a939,940
> struct target *targ = port->p_target;
> struct portal_group *pg = port->p_portal_group;
916c949
< snprintf(tagstr, sizeof(tagstr), "%d", targ->t_portal_group->pg_tag);
---
> snprintf(tagstr, sizeof(tagstr), "%d", pg->pg_tag);