svn commit: r288061 - head/usr.sbin/ctld
Alexander Motin
mav at FreeBSD.org
Mon Sep 21 10:27:31 UTC 2015
Author: mav
Date: Mon Sep 21 10:27:30 2015
New Revision: 288061
URL: https://svnweb.freebsd.org/changeset/base/288061
Log:
Make cltd ignore HA ports.
Modified:
head/usr.sbin/ctld/kernel.c
Modified: head/usr.sbin/ctld/kernel.c
==============================================================================
--- head/usr.sbin/ctld/kernel.c Mon Sep 21 10:24:34 2015 (r288060)
+++ head/usr.sbin/ctld/kernel.c Mon Sep 21 10:27:30 2015 (r288061)
@@ -119,6 +119,7 @@ struct cctl_lun {
struct cctl_port {
uint32_t port_id;
+ char *port_frontend;
char *port_name;
int pp;
int vp;
@@ -331,7 +332,10 @@ cctl_end_pelement(void *user_data, const
devlist->cur_sb[devlist->level] = NULL;
devlist->level--;
- if (strcmp(name, "port_name") == 0) {
+ if (strcmp(name, "frontend_type") == 0) {
+ cur_port->port_frontend = str;
+ str = NULL;
+ } else if (strcmp(name, "port_name") == 0) {
cur_port->port_name = str;
str = NULL;
} else if (strcmp(name, "physical_port") == 0) {
@@ -506,6 +510,8 @@ retry_port:
name = NULL;
STAILQ_FOREACH(port, &devlist.port_list, links) {
+ if (strcmp(port->port_frontend, "ha") == 0)
+ continue;
if (name)
free(name);
if (port->pp == 0 && port->vp == 0)
More information about the svn-src-all
mailing list