Hello community,
here is the log from the commit of package open-iscsi for openSUSE:Factory
checked in at 2018-04-22 14:32:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old)
and /work/SRC/openSUSE:Factory/.open-iscsi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-iscsi"
Sun Apr 22 14:32:08 2018 rev:71 rq:597859 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2018-03-26
12:33:49.740624130 +0200
+++ /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi.changes
2018-04-22 14:32:13.225077195 +0200
@@ -1,0 +2,14 @@
+Wed Apr 18 17:17:52 UTC 2018 - ldun...@suse.com
+
+- Added upstream patch to allow host_id of 0 (bsc#1089687),
+ updating:
+ * open-iscsi-SUSE-latest.diff.bz2
+
+-------------------------------------------------------------------
+Fri Apr 13 20:50:05 UTC 2018 - ldun...@suse.com
+
+- Added 2 upstream commits to address issue of iscsi_if.h
+ stayig in sync with kernel vesion (bsc#1086344), updating:
+ * open-iscsi-SUSE-latest.diff.bz2
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ open-iscsi-SUSE-latest.diff.bz2 ++++++
--- /var/tmp/diff_new_pack.alOWpI/_old 2018-04-22 14:32:13.797056494 +0200
+++ /var/tmp/diff_new_pack.alOWpI/_new 2018-04-22 14:32:13.797056494 +0200
@@ -50,6 +50,48 @@
depend:
for dir in usr utils utils/fwparam_ibft; do \
+diff --git a/include/iscsi_if.h b/include/iscsi_if.h
+index 5be1981beb52..2d46214c2a60 100644
+--- a/include/iscsi_if.h
++++ b/include/iscsi_if.h
+@@ -30,6 +30,12 @@
+
+ #include "iscsi_proto.h"
+
++/*
++ * NOTE: This file should be kept in sync with the kernel include file
++ * of the same name. In particular, iscsi_param and iscsi_err need
++ * to be in sync.
++ */
++
+ #define ISCSI_NL_GRP_ISCSID 1
+ #define ISCSI_NL_GRP_UIP 2
+
+@@ -536,6 +542,7 @@ enum iscsi_err {
+ ISCSI_ERR_XMIT_FAILED = ISCSI_ERR_BASE + 19,
+ ISCSI_ERR_TCP_CONN_CLOSE = ISCSI_ERR_BASE + 20,
+ ISCSI_ERR_SCSI_EH_SESSION_RST = ISCSI_ERR_BASE + 21,
++ ISCSI_ERR_NOP_TIMEDOUT = ISCSI_ERR_BASE + 22,
+ };
+
+ /*
+@@ -627,6 +634,7 @@ enum iscsi_param {
+
+ ISCSI_PARAM_DISCOVERY_PARENT_IDX,
+ ISCSI_PARAM_DISCOVERY_PARENT_TYPE,
++ ISCSI_PARAM_LOCAL_IPADDR,
+ /* must always be last */
+ ISCSI_PARAM_MAX,
+ };
+@@ -731,6 +739,8 @@ enum iscsi_port_speed {
+ ISCSI_PORT_SPEED_100MBPS = 0x4,
+ ISCSI_PORT_SPEED_1GBPS = 0x8,
+ ISCSI_PORT_SPEED_10GBPS = 0x10,
++ ISCSI_PORT_SPEED_25GBPS = 0x20,
++ ISCSI_PORT_SPEED_40GBPS = 0x40,
+ };
+
+ /* iSCSI port state */
diff --git a/iscsiuio/src/unix/libs/cnic.c b/iscsiuio/src/unix/libs/cnic.c
index 9662f024041b..86fb1889db5c 100644
--- a/iscsiuio/src/unix/libs/cnic.c
@@ -116,6 +158,18 @@
$(INSTALL) -m 644 -D $(PKGFILE).in $(DESTDIR)$(PKGCONF_DIR)/$(PKGFILE)
perl -i -pe 's|__VERSION__|$(LIBNVME_VERSION)|g' \
$(DESTDIR)$(PKGCONF_DIR)/$(PKGFILE)
+diff --git a/libopeniscsiusr/iface.c b/libopeniscsiusr/iface.c
+index 79898df45b33..c8519a7ea34e 100644
+--- a/libopeniscsiusr/iface.c
++++ b/libopeniscsiusr/iface.c
+@@ -158,7 +158,6 @@ int _iscsi_iface_get(struct iscsi_context *ctx, uint32_t
host_id, uint32_t sid,
+ char proc_name[ISCSI_TRANSPORT_NAME_MAXLEN];
+
+ assert(ctx != NULL);
+- assert(host_id != 0);
+ assert(sid != 0);
+ /* TODO(Gris Ge): Handle when sid == 0(ignored) */
+ assert(iface != NULL);
diff --git a/libopeniscsiusr/sysfs.c b/libopeniscsiusr/sysfs.c
index 70298f21a0df..6f590f428efa 100644
--- a/libopeniscsiusr/sysfs.c
@@ -201,3 +255,16 @@
n = scandir(path_full, &namelist, trans_filter,
alphasort);
if (n <= 0)
+diff --git a/usr/kern_err_table.c b/usr/kern_err_table.c
+index a6ea8fbc7e37..8af6f054c4a5 100644
+--- a/usr/kern_err_table.c
++++ b/usr/kern_err_table.c
+@@ -77,6 +77,8 @@ const char *kern_err_code_to_string(int err)
+ case ISCSI_ERR_SCSI_EH_SESSION_RST:
+ return "ISCSI_ERR_SCSI_EH_SESSION_RST: Session was dropped as "
+ "a result of SCSI error recovery";
++ case ISCSI_ERR_NOP_TIMEDOUT:
++ return "ISCSI_ERR_NOP_TIMEDOUT: A NOP has timed out";
+ default:
+ return "Invalid or unknown error code";
+ }
