rpms/iscsi-initiator-utils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

update to 2.0.874

Browse Source
This commit is contained in:
Chris Leech 2017-02-09 14:40:49 -08:00
parent 7bc51f92c5
commit 7c06f46fb7
27 changed files with 128 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/iscsiuio-0.7.2.1.tar.gz /iscsiuio-0.7.2.1.tar.gz
/open-iscsi-4c9d6f9.tar.gz /open-iscsi-4c9d6f9.tar.gz
/open-iscsi-4c1f2d9.tar.gz /open-iscsi-4c1f2d9.tar.gz
/open-iscsi-86e8892.tar.gz

58
0001-Build-system-sort-object-file-lists.patch
View File

@ -1,58 +0,0 @@
From a919d214d10870a54c6a5e383a19a6e82e5f8a54 Mon Sep 17 00:00:00 2001
From: Christian Seiler <christian@iwakd.de>
Date: Sat, 13 Feb 2016 00:56:19 +0100
Subject: [PATCH] Build system: sort object file lists
The object file list generated by the wildcard Makefile function is not
deterministic, because it may change depending on the underlying file
system.
Use the sort function to make the list deterministic in these cases, to
be able to build open-iscsi deterministically. See
<https://reproducible-builds.org/>
for further details.
Signed-off-by: Christian Seiler <christian@iwakd.de>
---
usr/Makefile | 4 ++--
utils/fwparam_ibft/Makefile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/usr/Makefile b/usr/Makefile
index 5ac0726..277ac6a 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -34,7 +34,7 @@ CFLAGS += $(WARNFLAGS) -I../include -I. -D$(OSNAME) $(IPC_CFLAGS)
PROGRAMS = iscsid iscsiadm iscsistart
# libc compat files
-SYSDEPS_SRCS = $(wildcard ../utils/sysdeps/*.o)
+SYSDEPS_SRCS = $(sort $(wildcard ../utils/sysdeps/*.o))
# sources shared between iscsid, iscsiadm and iscsistart
ISCSI_LIB_SRCS = iscsi_util.o io.o auth.o iscsi_timer.o login.o log.o md5.o \
sha1.o iface.o idbm.o sysfs.o host.o session_info.o iscsi_sysfs.o \
@@ -45,7 +45,7 @@ ISCSI_LIB_SRCS = iscsi_util.o io.o auth.o iscsi_timer.o login.o log.o md5.o \
INITIATOR_SRCS = initiator.o scsi.o actor.o event_poll.o mgmt_ipc.o kern_err_table.o
# fw boot files
-FW_BOOT_SRCS = $(wildcard ../utils/fwparam_ibft/*.o)
+FW_BOOT_SRCS = $(sort $(wildcard ../utils/fwparam_ibft/*.o))
# core discovery files
DISCOVERY_SRCS = $(FW_BOOT_SRCS) strings.o discovery.o
diff --git a/utils/fwparam_ibft/Makefile b/utils/fwparam_ibft/Makefile
index 773d8eb..ade8a56 100644
--- a/utils/fwparam_ibft/Makefile
+++ b/utils/fwparam_ibft/Makefile
@@ -21,7 +21,7 @@
# "Prasanna Mumbai" <mumbai.prasanna@gmail.com>
#
-SYSDEPS_OBJS = $(wildcard ../sysdeps/*.o)
+SYSDEPS_OBJS = $(sort $(wildcard ../sysdeps/*.o))
OBJS := fw_entry.o fwparam_sysfs.o $(SYSDEPS_OBJS) ../../usr/iscsi_net_util.o
OBJS += prom_lex.o prom_parse.tab.o fwparam_ppc.o
CLEANFILES = $(OBJS) *.output *~
--
2.1.4

8
open-iscsi-v2.0.873-4c9d6f9-1-idmb_rec_write-check-for-tpgt-first.patch → 0001-idmb_rec_write-check-for-tpgt-first.patch
View File

@ -1,7 +1,7 @@
From 974339c4e2f8321057bb5a28611433bbd5e28463 Mon Sep 17 00:00:00 2001 From 9d49de368fbe87827d1819298cb9f3328e825f05 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Tue, 13 Aug 2013 10:59:44 -0700 Date: Tue, 13 Aug 2013 10:59:44 -0700
Subject: [PATCH] idmb_rec_write, check for tpgt first Subject: [PATCH 01/22] idmb_rec_write, check for tpgt first
Factor out the check for a tpgt to a single place, before going crazy on Factor out the check for a tpgt to a single place, before going crazy on
the rec files. Makes flow of this function easier to follow, and preps the rec files. Makes flow of this function easier to follow, and preps
@ -11,7 +11,7 @@ for splitting it up.
1 file changed, 5 insertions(+), 13 deletions(-) 1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/usr/idbm.c b/usr/idbm.c diff --git a/usr/idbm.c b/usr/idbm.c
index 198a5ef..caec94f 100644 index 3b8a5a2..1c59033 100644
--- a/usr/idbm.c --- a/usr/idbm.c
+++ b/usr/idbm.c +++ b/usr/idbm.c
@@ -2041,6 +2041,10 @@ static int idbm_rec_write(node_rec_t *rec) @@ -2041,6 +2041,10 @@ static int idbm_rec_write(node_rec_t *rec)
@ -51,5 +51,5 @@ index 198a5ef..caec94f 100644
*/ */
if (unlink(portal)) { if (unlink(portal)) {
-- --
2.1.0 2.9.3

8
open-iscsi-v2.0.873-4c9d6f9-2-idbm_rec_write-seperate-old-and-new-style-writes.patch → 0002-idbm_rec_write-seperate-old-and-new-style-writes.patch
View File

@ -1,7 +1,7 @@
From 42412c08a8b0f38650f36aeaf311d558f96a749f Mon Sep 17 00:00:00 2001 From 33ea65a592d9666b3353736db0a33041089c211c Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Tue, 13 Aug 2013 11:34:31 -0700 Date: Tue, 13 Aug 2013 11:34:31 -0700
Subject: [PATCH] idbm_rec_write, seperate old and new style writes Subject: [PATCH 02/22] idbm_rec_write, seperate old and new style writes
Duplicates a small bit of code, but easier to understand and extened. Duplicates a small bit of code, but easier to understand and extened.
--- ---
@ -9,7 +9,7 @@ Duplicates a small bit of code, but easier to understand and extened.
1 file changed, 79 insertions(+), 37 deletions(-) 1 file changed, 79 insertions(+), 37 deletions(-)
diff --git a/usr/idbm.c b/usr/idbm.c diff --git a/usr/idbm.c b/usr/idbm.c
index caec94f..63265c2 100644 index 1c59033..76816f2 100644
--- a/usr/idbm.c --- a/usr/idbm.c
+++ b/usr/idbm.c +++ b/usr/idbm.c
@@ -2000,7 +2000,7 @@ mkdir_portal: @@ -2000,7 +2000,7 @@ mkdir_portal:
@ -176,5 +176,5 @@ index caec94f..63265c2 100644
free_portal: free_portal:
free(portal); free(portal);
-- --
2.1.0 2.9.3

8
open-iscsi-v2.0.873-4c9d6f9-3-idbw_rec_write-pick-tpgt-from-existing-record.patch → 0003-idbw_rec_write-pick-tpgt-from-existing-record.patch
View File

@ -1,7 +1,7 @@
From 4fab0a9cc43f057296d7fc0e6f9b3f9897a3e5bc Mon Sep 17 00:00:00 2001 From b9648028e0b3ac8ec5967bc47d9575cbcc5ac6f6 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Tue, 13 Aug 2013 12:39:07 -0700 Date: Tue, 13 Aug 2013 12:39:07 -0700
Subject: [PATCH] idbw_rec_write, pick tpgt from existing record Subject: [PATCH 03/22] idbw_rec_write, pick tpgt from existing record
On a static add (-m node -o new) without a user specified tpgt, looks On a static add (-m node -o new) without a user specified tpgt, looks
for existing new style records with tpgt before creating an old style for existing new style records with tpgt before creating an old style
@ -12,7 +12,7 @@ updated new style record instead.
1 file changed, 40 insertions(+) 1 file changed, 40 insertions(+)
diff --git a/usr/idbm.c b/usr/idbm.c diff --git a/usr/idbm.c b/usr/idbm.c
index 63265c2..d8f42b6 100644 index 76816f2..cdf94b6 100644
--- a/usr/idbm.c --- a/usr/idbm.c
+++ b/usr/idbm.c +++ b/usr/idbm.c
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
@ -83,5 +83,5 @@ index 63265c2..d8f42b6 100644
rec->name, rec->conn[0].address, rec->conn[0].port); rec->name, rec->conn[0].address, rec->conn[0].port);
-- --
2.1.0 2.9.3

8
open-iscsi-v2.0.873-4c9d6f9-4-update-systemd-service-files-add-iscsi.service-for-s.patch → 0004-update-systemd-service-files-add-iscsi.service-for-s.patch
View File

@ -1,8 +1,8 @@
From d9f3f79341167e5cd956683bf2d223b8e9114745 Mon Sep 17 00:00:00 2001 From b3b8d7d3738dc29600ea9a2f4c61df578212294c Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Wed, 19 Dec 2012 15:07:36 -0800 Date: Wed, 19 Dec 2012 15:07:36 -0800
Subject: [PATCH] update systemd service files, add iscsi.service for starting Subject: [PATCH 04/22] update systemd service files, add iscsi.service for
sessions on boot starting sessions on boot
Signed-off-by: Chris Leech <cleech@redhat.com> Signed-off-by: Chris Leech <cleech@redhat.com>
--- ---
@ -89,5 +89,5 @@ index 832451d..58a8d12 100644
[Socket] [Socket]
ListenStream=@ISCSIADM_ABSTRACT_NAMESPACE ListenStream=@ISCSIADM_ABSTRACT_NAMESPACE
-- --
2.1.0 2.9.3

6
open-iscsi-v2.0.873-4c9d6f9-5-iscsi-boot-related-service-file-updates.patch → 0005-iscsi-boot-related-service-file-updates.patch
View File

@ -1,7 +1,7 @@
From 41c832215e1d76907c28eccd6b5a29d7356ae34e Mon Sep 17 00:00:00 2001 From 945365b60cba1c3eab57713d2ee58d337d44327a Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Mon, 19 Aug 2013 07:18:25 -0700 Date: Mon, 19 Aug 2013 07:18:25 -0700
Subject: [PATCH] iscsi boot related service file updates Subject: [PATCH 05/22] iscsi boot related service file updates
make sure iscsid gets started if there are any boot sessions running make sure iscsid gets started if there are any boot sessions running
add reload target to fix double session problem when restarting from NM add reload target to fix double session problem when restarting from NM
@ -71,5 +71,5 @@ index c68475c..0000000
-done < $SESSION_FILE -done < $SESSION_FILE
- -
-- --
2.1.0 2.9.3

12
open-iscsi-v2.0.873-4c9d6f9-6-update-initscripts-and-docs.patch → 0006-update-initscripts-and-docs.patch
View File

@ -1,7 +1,7 @@
From 42b331859a5fbbf4ed63c558828480c9070eccdc Mon Sep 17 00:00:00 2001 From c857ddd55cab3c9f67d496ca9f1666c4999aa376 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Mon, 19 Nov 2012 16:37:13 -0800 Date: Mon, 19 Nov 2012 16:37:13 -0800
Subject: [PATCH] update initscripts and docs Subject: [PATCH 06/22] update initscripts and docs
--- ---
README | 9 +++------ README | 9 +++------
@ -10,7 +10,7 @@ Subject: [PATCH] update initscripts and docs
3 files changed, 18 insertions(+), 18 deletions(-) 3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/README b/README diff --git a/README b/README
index cbe8763..8db3013 100644 index 278292b..3757b2d 100644
--- a/README --- a/README
+++ b/README +++ b/README
@@ -74,11 +74,6 @@ the cache sync command will fail. @@ -74,11 +74,6 @@ the cache sync command will fail.
@ -44,7 +44,7 @@ index cbe8763..8db3013 100644
Example: Example:
-------- --------
diff --git a/etc/iscsid.conf b/etc/iscsid.conf diff --git a/etc/iscsid.conf b/etc/iscsid.conf
index c30a7dc..cfa6844 100644 index f7ecb6b..46da83f 100644
--- a/etc/iscsid.conf --- a/etc/iscsid.conf
+++ b/etc/iscsid.conf +++ b/etc/iscsid.conf
@@ -17,10 +17,10 @@ @@ -17,10 +17,10 @@
@ -108,7 +108,7 @@ index c30a7dc..cfa6844 100644
# For multipath configurations, you may want more than one session to be # For multipath configurations, you may want more than one session to be
# created on each iface record. If node.session.nr_sessions is greater # created on each iface record. If node.session.nr_sessions is greater
diff --git a/usr/idbm.c b/usr/idbm.c diff --git a/usr/idbm.c b/usr/idbm.c
index d8f42b6..589078c 100644 index cdf94b6..8e3fd89 100644
--- a/usr/idbm.c --- a/usr/idbm.c
+++ b/usr/idbm.c +++ b/usr/idbm.c
@@ -512,9 +512,13 @@ idbm_recinfo_node(node_rec_t *r, recinfo_t *ri) @@ -512,9 +512,13 @@ idbm_recinfo_node(node_rec_t *r, recinfo_t *ri)
@ -126,5 +126,5 @@ index d8f42b6..589078c 100644
__recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW, __recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW,
"No", "Yes", num, 1); "No", "Yes", num, 1);
-- --
2.1.0 2.9.3

28
open-iscsi-v2.0.873-4c9d6f9-7-use-var-for-config.patch → 0007-use-var-for-config.patch
View File

@ -1,7 +1,7 @@
From 45031a3cf05a2b1c2b558e361299fc0e5964a4e1 Mon Sep 17 00:00:00 2001 From 30345def1a6c09f83628dc161d65cc0e90d665f1 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Mon, 19 Nov 2012 16:38:45 -0800 Date: Mon, 19 Nov 2012 16:38:45 -0800
Subject: [PATCH] use var for config Subject: [PATCH 07/22] use var for config
--- ---
README | 33 ++++++++++++++++----------------- README | 33 ++++++++++++++++-----------------
@ -12,7 +12,7 @@ Subject: [PATCH] use var for config
5 files changed, 33 insertions(+), 31 deletions(-) 5 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/README b/README diff --git a/README b/README
index 8db3013..cfc7f2f 100644 index 3757b2d..fa38c8c 100644
--- a/README --- a/README
+++ b/README +++ b/README
@@ -170,8 +170,7 @@ Usage: iscsid [OPTION] @@ -170,8 +170,7 @@ Usage: iscsid [OPTION]
@ -45,13 +45,13 @@ index 8db3013..cfc7f2f 100644
iface_name transport_name,hwaddress,ipaddress,net_ifacename,initiatorname iface_name transport_name,hwaddress,ipaddress,net_ifacename,initiatorname
For software iscsi, you can create the iface configs by hand, but it is For software iscsi, you can create the iface configs by hand, but it is
reccomended that you use iscsiadm's iface mode. There is a iface.example in recommended that you use iscsiadm's iface mode. There is an iface.example in
-/etc/iscsi/ifaces which can be used as a template for the daring. -/etc/iscsi/ifaces which can be used as a template for the daring.
+/var/lib/iscsi/ifaces which can be used as a template for the daring. +/var/lib/iscsi/ifaces which can be used as a template for the daring.
For each network object you wish to bind a session to you must create For each network object you wish to bind a session to you must create
-a seperate iface config in /etc/iscsi/ifaces and each iface config file -a separate iface config in /etc/iscsi/ifaces and each iface config file
+a seperate iface config in /var/lib/iscsi/ifaces and each iface config file +a separate iface config in /var/lib/iscsi/ifaces and each iface config file
must have a unique name which is less than or equal to 64 characters. must have a unique name which is less than or equal to 64 characters.
Example: Example:
@ -78,7 +78,7 @@ index 8db3013..cfc7f2f 100644
The format is: The format is:
iface_name transport_name,hwaddress,ipaddress,net_ifacename,initiatorname iface_name transport_name,hwaddress,ipaddress,net_ifacename,initiatorname
@@ -681,7 +680,7 @@ need a seperate network connection to the target for discovery purposes. @@ -681,7 +680,7 @@ need a separate network connection to the target for discovery purposes.
*This will be fixed in the next version of open-iscsi* *This will be fixed in the next version of open-iscsi*
For compatibility reasons, when you run iscsiadm to do discovery, it For compatibility reasons, when you run iscsiadm to do discovery, it
@ -87,7 +87,7 @@ index 8db3013..cfc7f2f 100644
tcp for the iface.transport and it will bind the portals that are discovered tcp for the iface.transport and it will bind the portals that are discovered
so that they will be logged in through those ifaces. This behavior can also so that they will be logged in through those ifaces. This behavior can also
be overriden by passing in the interfaces you want to use. For the case be overriden by passing in the interfaces you want to use. For the case
@@ -699,7 +698,7 @@ we do not bind a session to a iface, then you can use the special iface @@ -699,7 +698,7 @@ we do not bind a session to an iface, then you can use the special iface
iscsiadm -m discoverydb -t st -p ip:port -I default --discover -P 1 iscsiadm -m discoverydb -t st -p ip:port -I default --discover -P 1
@ -96,7 +96,7 @@ index 8db3013..cfc7f2f 100644
not pass anything into iscsiadm, running iscsiadm will do the default not pass anything into iscsiadm, running iscsiadm will do the default
behavior, where we allow the network subsystem to decide which behavior, where we allow the network subsystem to decide which
device to use. device to use.
@@ -741,7 +740,7 @@ To now log into targets it is the same as with sofware iscsi. See section @@ -741,7 +740,7 @@ To now log into targets it is the same as with software iscsi. See section
./iscsiadm -m discoverydb -t st -p 192.168.1.1:3260 --discover ./iscsiadm -m discoverydb -t st -p 192.168.1.1:3260 --discover
@ -105,7 +105,7 @@ index 8db3013..cfc7f2f 100644
ID [portal = 192.168.1.1:3260 and type = sendtargets. If found it ID [portal = 192.168.1.1:3260 and type = sendtargets. If found it
will perform discovery using the settings stored in the record. will perform discovery using the settings stored in the record.
If a record does not exist, it will be created using the iscsid.conf If a record does not exist, it will be created using the iscsid.conf
@@ -750,7 +749,7 @@ To now log into targets it is the same as with sofware iscsi. See section @@ -750,7 +749,7 @@ To now log into targets it is the same as with software iscsi. See section
The argument to -p may also be a hostname instead of an address. The argument to -p may also be a hostname instead of an address.
./iscsiadm -m discoverydb -t st -p smoehost --discover ./iscsiadm -m discoverydb -t st -p smoehost --discover
@ -114,7 +114,7 @@ index 8db3013..cfc7f2f 100644
interfaces using software iscsi. If any are found then nodes found interfaces using software iscsi. If any are found then nodes found
during discovery will be setup so that they can logged in through during discovery will be setup so that they can logged in through
those interfaces. To specify a specific iface, pass the those interfaces. To specify a specific iface, pass the
@@ -806,7 +805,7 @@ To now log into targets it is the same as with sofware iscsi. See section @@ -806,7 +805,7 @@ To now log into targets it is the same as with software iscsi. See section
This command will perform discovery, but not manipulate the node DB. This command will perform discovery, but not manipulate the node DB.
- SendTargets iSCSI Discovery with a specific interface. If you - SendTargets iSCSI Discovery with a specific interface. If you
@ -144,7 +144,7 @@ index 8db3013..cfc7f2f 100644
Note that for iSNS the poll_interval does not have to be set. If not set, Note that for iSNS the poll_interval does not have to be set. If not set,
iscsid will only perform rediscovery when it gets a SCN from the server. iscsid will only perform rediscovery when it gets a SCN from the server.
diff --git a/doc/iscsiadm.8 b/doc/iscsiadm.8 diff --git a/doc/iscsiadm.8 b/doc/iscsiadm.8
index c7d8c92..3f33f6c 100644 index a82805e..758a47c 100644
--- a/doc/iscsiadm.8 --- a/doc/iscsiadm.8
+++ b/doc/iscsiadm.8 +++ b/doc/iscsiadm.8
@@ -241,7 +241,7 @@ This option is only valid for ping submode. @@ -241,7 +241,7 @@ This option is only valid for ping submode.
@ -179,7 +179,7 @@ index c7d8c92..3f33f6c 100644
.SH "SEE ALSO" .SH "SEE ALSO"
diff --git a/usr/idbm.c b/usr/idbm.c diff --git a/usr/idbm.c b/usr/idbm.c
index 589078c..a57a445 100644 index 8e3fd89..934c657 100644
--- a/usr/idbm.c --- a/usr/idbm.c
+++ b/usr/idbm.c +++ b/usr/idbm.c
@@ -2917,9 +2917,9 @@ free_info: @@ -2917,9 +2917,9 @@ free_info:
@ -235,5 +235,5 @@ index 01f7074..f396918 100644
struct iface_rec; struct iface_rec;
struct list_head; struct list_head;
-- --
2.1.0 2.9.3

6
open-iscsi-v2.0.873-4c9d6f9-8-use-red-hat-for-name.patch → 0008-use-red-hat-for-name.patch
View File

@ -1,7 +1,7 @@
From ccdc848d3e9a10f4615fbb55aa928dd28b29df7b Mon Sep 17 00:00:00 2001 From 6eae13ab3f4ba35d45a4c1afb38c9a75a1797afc Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Mon, 19 Nov 2012 16:40:04 -0800 Date: Mon, 19 Nov 2012 16:40:04 -0800
Subject: [PATCH] use red hat for name Subject: [PATCH 08/22] use red hat for name
--- ---
utils/iscsi-iname.c | 2 +- utils/iscsi-iname.c | 2 +-
@ -21,5 +21,5 @@ index 6347edc..cb2f6c8 100644
/* try to feed some entropy from the pool to MD5 in order to get /* try to feed some entropy from the pool to MD5 in order to get
-- --
2.1.0 2.9.3

14
open-iscsi-v2.0.873-4c9d6f9-9-libiscsi.patch → 0009-libiscsi.patch
View File

@ -1,7 +1,7 @@
From 31d85c66cce07fedd0c8eba7dfba27ed573a26e9 Mon Sep 17 00:00:00 2001 From 9054091af1a23dca6482087a4104ca31a1598e74 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build> From: rpm-build <rpm-build>
Date: Mon, 26 Jan 2015 12:57:11 -0800 Date: Mon, 26 Jan 2015 12:57:11 -0800
Subject: [PATCH] libiscsi Subject: [PATCH 09/22] libiscsi
--- ---
Makefile | 2 + Makefile | 2 +
@ -3910,7 +3910,7 @@ index 0000000..a21f888
+ return rc; + return rc;
+} +}
diff --git a/usr/Makefile b/usr/Makefile diff --git a/usr/Makefile b/usr/Makefile
index 5ac0726..ae1e51f 100644 index c1866b6..6d3ce2e 100644
--- a/usr/Makefile --- a/usr/Makefile
+++ b/usr/Makefile +++ b/usr/Makefile
@@ -30,7 +30,7 @@ endif @@ -30,7 +30,7 @@ endif
@ -3923,7 +3923,7 @@ index 5ac0726..ae1e51f 100644
# libc compat files # libc compat files
diff --git a/usr/discovery.c b/usr/discovery.c diff --git a/usr/discovery.c b/usr/discovery.c
index 43c2359..3cc2379 100644 index 593d226..de8267f 100644
--- a/usr/discovery.c --- a/usr/discovery.c
+++ b/usr/discovery.c +++ b/usr/discovery.c
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
@ -3964,11 +3964,11 @@ index 43c2359..3cc2379 100644
int discovery_fw(void *data, struct iface_rec *iface, int discovery_fw(void *data, struct iface_rec *iface,
struct list_head *rec_list) struct list_head *rec_list)
diff --git a/usr/idbm.c b/usr/idbm.c diff --git a/usr/idbm.c b/usr/idbm.c
index a57a445..00151b5 100644 index 934c657..2e067df 100644
--- a/usr/idbm.c --- a/usr/idbm.c
+++ b/usr/idbm.c +++ b/usr/idbm.c
@@ -1709,9 +1709,9 @@ int idbm_print_all_discovery(int info_level) @@ -1709,9 +1709,9 @@ int idbm_print_all_discovery(int info_level)
* fn should return -1 if it skipped the rec, a ISCSI_ERR error code if * fn should return -1 if it skipped the rec, an ISCSI_ERR error code if
* the operation failed or 0 if fn was run successfully. * the operation failed or 0 if fn was run successfully.
*/ */
-static int idbm_for_each_iface(int *found, void *data, -static int idbm_for_each_iface(int *found, void *data,
@ -4006,5 +4006,5 @@ index 5087b5c..a6dc40a 100644
+ +
#endif /* ISCSI_IPC_H */ #endif /* ISCSI_IPC_H */
-- --
2.1.0 2.9.3

8
open-iscsi-v2.0.873-4c9d6f9-10-remove-the-offload-boot-supported-ifdef.patch → 0010-remove-the-offload-boot-supported-ifdef.patch
View File

@ -1,14 +1,14 @@
From 350deee0c814c5a3e2659436b69fdf999dd2d6a5 Mon Sep 17 00:00:00 2001 From 155942be75270dd7898c5b497d24f06f3b8e8457 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Mon, 19 Nov 2012 17:09:24 -0800 Date: Mon, 19 Nov 2012 17:09:24 -0800
Subject: [PATCH] remove the offload boot supported ifdef Subject: [PATCH 10/22] remove the offload boot supported ifdef
--- ---
usr/iface.c | 7 +------ usr/iface.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-) 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/usr/iface.c b/usr/iface.c diff --git a/usr/iface.c b/usr/iface.c
index 0a7f0bb..753ed37 100644 index 74e63f6..f5c0d0d 100644
--- a/usr/iface.c --- a/usr/iface.c
+++ b/usr/iface.c +++ b/usr/iface.c
@@ -996,6 +996,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface, @@ -996,6 +996,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
@ -41,5 +41,5 @@ index 0a7f0bb..753ed37 100644
return 0; return 0;
-- --
2.1.0 2.9.3

6
open-iscsi-v2.0.873-4c9d6f9-11-iscsiuio-systemd-unit-files.patch → 0011-iscsiuio-systemd-unit-files.patch
View File

@ -1,7 +1,7 @@
From d66273ad26fac7c6bbea6f6f0a34ea28ffd3a416 Mon Sep 17 00:00:00 2001 From 105bdf7e73e513f6d830d8d59e9bd5c21f77c04e Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Tue, 22 Jan 2013 14:27:12 -0800 Date: Tue, 22 Jan 2013 14:27:12 -0800
Subject: [PATCH] iscsiuio systemd unit files Subject: [PATCH 11/22] iscsiuio systemd unit files
--- ---
etc/systemd/iscsiuio.service | 17 +++++++++++++++++ etc/systemd/iscsiuio.service | 17 +++++++++++++++++
@ -49,5 +49,5 @@ index 0000000..d42cedc
+[Install] +[Install]
+WantedBy=sockets.target +WantedBy=sockets.target
-- --
2.1.0 2.9.3

10
open-iscsi-v2.0.873-4c9d6f9-12-disable-iscsid.startup-from-iscsiadm-prefer-systemd-.patch → 0012-disable-iscsid.startup-from-iscsiadm-prefer-systemd-.patch
View File

@ -1,15 +1,15 @@
From ae7a99ffb02936d6ab9da51ed1e98a08439a6acb Mon Sep 17 00:00:00 2001 From a76b5c01d4581cdf695d7691a79008b533efe95b Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Thu, 21 Feb 2013 21:05:39 -0800 Date: Thu, 21 Feb 2013 21:05:39 -0800
Subject: [PATCH] disable iscsid.startup from iscsiadm, prefer systemd socket Subject: [PATCH 12/22] disable iscsid.startup from iscsiadm, prefer systemd
activation socket activation
--- ---
etc/iscsid.conf | 2 +- etc/iscsid.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/iscsid.conf b/etc/iscsid.conf diff --git a/etc/iscsid.conf b/etc/iscsid.conf
index cfa6844..db395df 100644 index 46da83f..f4c6d7c 100644
--- a/etc/iscsid.conf --- a/etc/iscsid.conf
+++ b/etc/iscsid.conf +++ b/etc/iscsid.conf
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
@ -22,5 +22,5 @@ index cfa6844..db395df 100644
# Default for upstream open-iscsi scripts (uncomment to activate). # Default for upstream open-iscsi scripts (uncomment to activate).
# iscsid.startup = /sbin/iscsid # iscsid.startup = /sbin/iscsid
-- --
2.1.0 2.9.3

8
open-iscsi-v2.0.873-4c9d6f9-13-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch → 0013-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch
View File

@ -1,8 +1,8 @@
From 89aefb2bb117d9766cc3ff4e05f4e0735d108a41 Mon Sep 17 00:00:00 2001 From d0eb66bf5a232653ee81b23997897d1062826666 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Tue, 28 May 2013 13:12:27 -0700 Date: Tue, 28 May 2013 13:12:27 -0700
Subject: [PATCH] Don't check for autostart sessions if iscsi is not used (bug Subject: [PATCH 13/22] Don't check for autostart sessions if iscsi is not used
#951951) (bug #951951)
Change conditional startup in iscsi.service to check for a non-empty Change conditional startup in iscsi.service to check for a non-empty
nodes directory, instead of initiator-name. This fits better with what nodes directory, instead of initiator-name. This fits better with what
@ -26,5 +26,5 @@ index 0309e2f..d5712bd 100644
[Service] [Service]
Type=oneshot Type=oneshot
-- --
2.1.0 2.9.3

8
open-iscsi-v2.0.873-4c9d6f9-14-start-socket-listeners-on-iscsiadm-command.patch → 0014-start-socket-listeners-on-iscsiadm-command.patch
View File

@ -1,7 +1,7 @@
From a139c403e63a47b53b29df9588bed66db3d0d8d1 Mon Sep 17 00:00:00 2001 From fc105639723f891f1cda717e52baf7234310dfed Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Mon, 25 Nov 2013 22:28:12 -0800 Date: Mon, 25 Nov 2013 22:28:12 -0800
Subject: [PATCH] start socket listeners on iscsiadm command Subject: [PATCH 14/22] start socket listeners on iscsiadm command
fix for trying to run iscsiadm commands right after installing the rpm fix for trying to run iscsiadm commands right after installing the rpm
without manually starting the systemd units without manually starting the systemd units
@ -10,7 +10,7 @@ without manually starting the systemd units
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/etc/iscsid.conf b/etc/iscsid.conf diff --git a/etc/iscsid.conf b/etc/iscsid.conf
index db395df..16c00f0 100644 index f4c6d7c..bfabf7f 100644
--- a/etc/iscsid.conf --- a/etc/iscsid.conf
+++ b/etc/iscsid.conf +++ b/etc/iscsid.conf
@@ -17,7 +17,8 @@ @@ -17,7 +17,8 @@
@ -24,5 +24,5 @@ index db395df..16c00f0 100644
# Default for upstream open-iscsi scripts (uncomment to activate). # Default for upstream open-iscsi scripts (uncomment to activate).
# iscsid.startup = /sbin/iscsid # iscsid.startup = /sbin/iscsid
-- --
2.1.0 2.9.3

6
open-iscsi-v2.0.873-4c9d6f9-15-Revert-iscsiadm-return-error-when-login-fails.patch → 0015-Revert-iscsiadm-return-error-when-login-fails.patch
View File

@ -1,7 +1,7 @@
From d7e58a63422351cdf0e7a3917a7f1a4303036878 Mon Sep 17 00:00:00 2001 From 2200edaea16c00e439ea665786430ebc9bd26cf0 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Mon, 24 Feb 2014 09:33:33 -0800 Date: Mon, 24 Feb 2014 09:33:33 -0800
Subject: [PATCH] Revert "iscsiadm: return error when login fails" Subject: [PATCH 15/22] Revert "iscsiadm: return error when login fails"
This reverts commit fc2a8e9a2911bc76f961fe3e4a159fab9b8b9691. This reverts commit fc2a8e9a2911bc76f961fe3e4a159fab9b8b9691.
@ -30,5 +30,5 @@ index 596085b..07f587d 100644
} }
-- --
2.1.0 2.9.3

6
open-iscsi-v2.0.873-4c9d6f9-16-update-handling-of-boot-sessions.patch → 0016-update-handling-of-boot-sessions.patch
View File

@ -1,7 +1,7 @@
From c769948e31e7d6239e792ed4e8f60b293811421b Mon Sep 17 00:00:00 2001 From bf334a968ed0a7c3c8d429d971cab9a189399c32 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Wed, 26 Feb 2014 16:33:48 -0800 Date: Wed, 26 Feb 2014 16:33:48 -0800
Subject: [PATCH] update handling of boot sessions Subject: [PATCH 16/22] update handling of boot sessions
force start iscsiuio if needed, socket activation does not seem to be force start iscsiuio if needed, socket activation does not seem to be
working for recovery working for recovery
@ -51,5 +51,5 @@ index 157be62..60dcd70 100644
+fi +fi
-- --
2.1.0 2.9.3

6
open-iscsi-v2.0.873-4c9d6f9-17-update-iscsi.service-for-boot-session-recovery.patch → 0017-update-iscsi.service-for-boot-session-recovery.patch
View File

@ -1,7 +1,7 @@
From 83e75cc234306e699067303bf573c41b4454ae87 Mon Sep 17 00:00:00 2001 From e032f33bcb166bb3a47b580192e8856765a26503 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Fri, 14 Mar 2014 09:22:21 -0700 Date: Fri, 14 Mar 2014 09:22:21 -0700
Subject: [PATCH] update iscsi.service for boot session recovery Subject: [PATCH 17/22] update iscsi.service for boot session recovery
--- ---
etc/systemd/iscsi.service | 5 +++-- etc/systemd/iscsi.service | 5 +++--
@ -30,5 +30,5 @@ index d5712bd..3de76c5 100644
ExecReload=/sbin/iscsiadm -m node --loginall=automatic ExecReload=/sbin/iscsiadm -m node --loginall=automatic
-- --
2.1.0 2.9.3

6
open-iscsi-v2.0.873-4c9d6f9-18-updates-to-iscsi.service.patch → 0018-updates-to-iscsi.service.patch
View File

@ -1,7 +1,7 @@
From fb58e20b5d988a4dc863ed0087f701efa1454d78 Mon Sep 17 00:00:00 2001 From f27dfc682af4758a15f37fb24ffc1dd08542d812 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Wed, 17 Sep 2014 09:58:39 -0700 Date: Wed, 17 Sep 2014 09:58:39 -0700
Subject: [PATCH] updates to iscsi.service Subject: [PATCH 18/22] updates to iscsi.service
Resolves: #1126524 Resolves: #1126524
Resolves: #1111925 Resolves: #1111925
@ -37,5 +37,5 @@ index 3de76c5..ad7be34 100644
[Install] [Install]
WantedBy=sysinit.target WantedBy=sysinit.target
-- --
2.1.0 2.9.3

6
open-iscsi-v2.0.873-4c9d6f9-19-make-session-shutdown-a-seperate-service.patch.patch → 0019-make-session-shutdown-a-seperate-service.patch.patch
View File

@ -1,7 +1,7 @@
From c4a695ec82c71e01ac2ab66a67b9b463a7ffb44f Mon Sep 17 00:00:00 2001 From 24e4c97887d28d8adfa80c990571633e9baa1c7b Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build> From: rpm-build <rpm-build>
Date: Tue, 13 Jan 2015 16:30:01 -0800 Date: Tue, 13 Jan 2015 16:30:01 -0800
Subject: [PATCH] make-session-shutdown-a-seperate-service.patch Subject: [PATCH 19/22] make-session-shutdown-a-seperate-service.patch
--- ---
etc/systemd/iscsi-shutdown.service | 14 ++++++++++++++ etc/systemd/iscsi-shutdown.service | 14 ++++++++++++++
@ -51,5 +51,5 @@ index ad7be34..2736956 100644
[Install] [Install]
-- --
2.1.0 2.9.3

6
open-iscsi-v2.0.873-4c9d6f9-20-Add-macros-to-release-GIL-lock.patch → 0020-Add-macros-to-release-GIL-lock.patch
View File

@ -1,7 +1,7 @@
From c152b424c406bcc0b6495be91fecc60eacabe9cb Mon Sep 17 00:00:00 2001 From 3c025d240c2c8196aea42d2979a22ac3134abf6b Mon Sep 17 00:00:00 2001
From: Jiri Konecny <jkonecny@redhat.com> From: Jiri Konecny <jkonecny@redhat.com>
Date: Mon, 11 May 2015 13:16:26 +0200 Date: Mon, 11 May 2015 13:16:26 +0200
Subject: [PATCH] Add macros to release GIL lock Subject: [PATCH 20/22] Add macros to release GIL lock
Other threads are blocked when GIL is not released before the time consuming Other threads are blocked when GIL is not released before the time consuming
functions. functions.
@ -52,5 +52,5 @@ index 8800853..40b5955 100644
libiscsi_get_error_string(context)); libiscsi_get_error_string(context));
return NULL; return NULL;
-- --
2.1.0 2.9.3

8
open-iscsi-v2.0.873-4c9d6f9-21-libiscsi-introduce-sessions-API.patch → 0021-libiscsi-introduce-sessions-API.patch
View File

@ -1,7 +1,7 @@
From 3029917e4ed624245cb6d3ab6fd6a4058530f988 Mon Sep 17 00:00:00 2001 From 2888bd75bb8bf47966d2b508a170f008d64327d3 Mon Sep 17 00:00:00 2001
From: Peter Hatina <phatina@redhat.com> From: Peter Hatina <phatina@redhat.com>
Date: Mon, 5 Oct 2015 16:50:36 -0700 Date: Mon, 5 Oct 2015 16:50:36 -0700
Subject: [PATCH] libiscsi introduce sessions API Subject: [PATCH 21/22] libiscsi introduce sessions API
--- ---
libiscsi/libiscsi.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++ libiscsi/libiscsi.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++
@ -242,7 +242,7 @@ index 756590e..a9891f4 100644
* *
* Set the given nodes iSCSI parameter named by \e parameter to value \e value. * Set the given nodes iSCSI parameter named by \e parameter to value \e value.
diff --git a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c diff --git a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c
index 3a37a48..1420421 100644 index 84c396c..51d9ea5 100644
--- a/usr/iscsi_sysfs.c --- a/usr/iscsi_sysfs.c
+++ b/usr/iscsi_sysfs.c +++ b/usr/iscsi_sysfs.c
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
@ -286,5 +286,5 @@ index 9a56105..e4eaf20 100644
int *nr_found, int *nr_found,
iscsi_sysfs_iface_op_fn *fn); iscsi_sysfs_iface_op_fn *fn);
-- --
2.1.0 2.9.3

12
open-iscsi-v2.0.873-4c9d6f9-22-use-Red-Hat-version-string-to-match-RPM-package-vers.patch → 0022-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
View File

@ -1,25 +1,25 @@
From 72c4065472070e543c2d1e1aa0375fb87a2c3e6c Mon Sep 17 00:00:00 2001 From f55c3d07e3625958b9c9da5deb9b200d9ad6b2bf Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com> From: Chris Leech <cleech@redhat.com>
Date: Mon, 21 Jan 2013 15:43:36 -0800 Date: Mon, 21 Jan 2013 15:43:36 -0800
Subject: [PATCH] use Red Hat version string to match RPM package version Subject: [PATCH 22/22] use Red Hat version string to match RPM package version
--- ---
usr/version.h | 2 +- usr/version.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr/version.h b/usr/version.h diff --git a/usr/version.h b/usr/version.h
index a090522..6894655 100644 index 20f0794..333c3cc 100644
--- a/usr/version.h --- a/usr/version.h
+++ b/usr/version.h +++ b/usr/version.h
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
* This may not be the same value as the kernel versions because * This may not be the same value as the kernel versions because
* some other maintainer could merge a patch without going through us * some other maintainer could merge a patch without going through us
*/ */
-#define ISCSI_VERSION_STR "2.0-873" -#define ISCSI_VERSION_STR "2.0-874"
+#define ISCSI_VERSION_STR "6.2.0.873-33" +#define ISCSI_VERSION_STR "6.2.0.874"
#define ISCSI_VERSION_FILE "/sys/module/scsi_transport_iscsi/version" #define ISCSI_VERSION_FILE "/sys/module/scsi_transport_iscsi/version"
#endif #endif
-- --
2.1.0 2.9.3

58
iscsi-initiator-utils.spec
View File

@ -1,44 +1,41 @@
%global open_iscsi_version 2.0 %global open_iscsi_version 2.0
%global open_iscsi_build 873 %global open_iscsi_build 874
%global commit0 4c1f2d90ef1c73e33d9f1e4ae9c206ffe015a8f9 %global commit0 86e88927d1ffbadff37f5d2137e5c73c50845843
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Summary: iSCSI daemon and utility programs Summary: iSCSI daemon and utility programs
Name: iscsi-initiator-utils Name: iscsi-initiator-utils
Version: 6.%{open_iscsi_version}.%{open_iscsi_build} Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
Release: 35.git%{shortcommit0}%{?dist} Release: 1.git%{shortcommit0}%{?dist}
Group: System Environment/Daemons Group: System Environment/Daemons
License: GPLv2+ License: GPLv2+
URL: http://www.open-iscsi.org URL: http://www.open-iscsi.org
Source0: https://github.com/mikechristie/open-iscsi/archive/%{commit0}.tar.gz#/open-iscsi-%{shortcommit0}.tar.gz Source0: https://github.com/open-iscsi/open-iscsi/archive/%{commit0}.tar.gz#/open-iscsi-%{shortcommit0}.tar.gz
Source4: 04-iscsi Source4: 04-iscsi
Source5: iscsi-tmpfiles.conf Source5: iscsi-tmpfiles.conf
Patch1: open-iscsi-v2.0.873-4c9d6f9-1-idmb_rec_write-check-for-tpgt-first.patch Patch0001: 0001-idmb_rec_write-check-for-tpgt-first.patch
Patch2: open-iscsi-v2.0.873-4c9d6f9-2-idbm_rec_write-seperate-old-and-new-style-writes.patch Patch0002: 0002-idbm_rec_write-seperate-old-and-new-style-writes.patch
Patch3:open-iscsi-v2.0.873-4c9d6f9-3-idbw_rec_write-pick-tpgt-from-existing-record.patch Patch0003: 0003-idbw_rec_write-pick-tpgt-from-existing-record.patch
Patch4:open-iscsi-v2.0.873-4c9d6f9-4-update-systemd-service-files-add-iscsi.service-for-s.patch Patch0004: 0004-update-systemd-service-files-add-iscsi.service-for-s.patch
Patch5:open-iscsi-v2.0.873-4c9d6f9-5-iscsi-boot-related-service-file-updates.patch Patch0005: 0005-iscsi-boot-related-service-file-updates.patch
Patch6:open-iscsi-v2.0.873-4c9d6f9-6-update-initscripts-and-docs.patch Patch0006: 0006-update-initscripts-and-docs.patch
Patch7:open-iscsi-v2.0.873-4c9d6f9-7-use-var-for-config.patch Patch0007: 0007-use-var-for-config.patch
Patch8:open-iscsi-v2.0.873-4c9d6f9-8-use-red-hat-for-name.patch Patch0008: 0008-use-red-hat-for-name.patch
Patch9:open-iscsi-v2.0.873-4c9d6f9-9-libiscsi.patch Patch0009: 0009-libiscsi.patch
Patch10:open-iscsi-v2.0.873-4c9d6f9-10-remove-the-offload-boot-supported-ifdef.patch Patch0010: 0010-remove-the-offload-boot-supported-ifdef.patch
Patch11:open-iscsi-v2.0.873-4c9d6f9-11-iscsiuio-systemd-unit-files.patch Patch0011: 0011-iscsiuio-systemd-unit-files.patch
Patch12:open-iscsi-v2.0.873-4c9d6f9-12-disable-iscsid.startup-from-iscsiadm-prefer-systemd-.patch Patch0012: 0012-disable-iscsid.startup-from-iscsiadm-prefer-systemd-.patch
Patch13:open-iscsi-v2.0.873-4c9d6f9-13-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch Patch0013: 0013-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch
Patch14:open-iscsi-v2.0.873-4c9d6f9-14-start-socket-listeners-on-iscsiadm-command.patch Patch0014: 0014-start-socket-listeners-on-iscsiadm-command.patch
Patch15:open-iscsi-v2.0.873-4c9d6f9-15-Revert-iscsiadm-return-error-when-login-fails.patch Patch0015: 0015-Revert-iscsiadm-return-error-when-login-fails.patch
Patch16:open-iscsi-v2.0.873-4c9d6f9-16-update-handling-of-boot-sessions.patch Patch0016: 0016-update-handling-of-boot-sessions.patch
Patch17:open-iscsi-v2.0.873-4c9d6f9-17-update-iscsi.service-for-boot-session-recovery.patch Patch0017: 0017-update-iscsi.service-for-boot-session-recovery.patch
Patch18:open-iscsi-v2.0.873-4c9d6f9-18-updates-to-iscsi.service.patch Patch0018: 0018-updates-to-iscsi.service.patch
Patch19:open-iscsi-v2.0.873-4c9d6f9-19-make-session-shutdown-a-seperate-service.patch.patch Patch0019: 0019-make-session-shutdown-a-seperate-service.patch.patch
Patch20:open-iscsi-v2.0.873-4c9d6f9-20-Add-macros-to-release-GIL-lock.patch Patch0020: 0020-Add-macros-to-release-GIL-lock.patch
Patch21:open-iscsi-v2.0.873-4c9d6f9-21-libiscsi-introduce-sessions-API.patch Patch0021: 0021-libiscsi-introduce-sessions-API.patch
# ugly version string patch, should change with every rebuild Patch0022: 0022-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
Patch22:open-iscsi-v2.0.873-4c9d6f9-22-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
Patch23: 0001-Build-system-sort-object-file-lists.patch
Patch24: open-iscsi-2.0.873-157-remove-sysfs-attr_list.patch
BuildRequires: flex bison python2-devel python3-devel python-setuptools doxygen kmod-devel systemd-units BuildRequires: flex bison python2-devel python3-devel python-setuptools doxygen kmod-devel systemd-units
BuildRequires: autoconf automake libtool libmount-devel openssl-devel BuildRequires: autoconf automake libtool libmount-devel openssl-devel
@ -280,6 +277,9 @@ fi
%{python3_sitearch}/* %{python3_sitearch}/*
%changelog %changelog
* Thu Feb 09 2017 Chris Leech <cleech@redhat.com> - 6.2.0.874-1
- update to 2.0.874
* Mon Dec 12 2016 Charalampos Stratakis <cstratak@redhat.com> - 6.2.0.873-35.git4c1f2d9 * Mon Dec 12 2016 Charalampos Stratakis <cstratak@redhat.com> - 6.2.0.873-35.git4c1f2d9
- Rebuild for Python 3.6 - Rebuild for Python 3.6

214
open-iscsi-2.0.873-157-remove-sysfs-attr_list.patch
View File

@ -1,214 +0,0 @@
From 4ff8602c62ed908a7b7d5f51e863ed0ab4de2659 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com>
Date: Tue, 16 Feb 2016 16:45:26 -0800
Subject: [PATCH] remove sysfs attr_list
The global cache is not well designed, it quickly can grow to the point
where lookups take much longer than just doing the sysfs read in the
first place.
---
usr/host.c | 1 +
usr/session_info.c | 1 +
usr/sysfs.c | 62 ++++++++++++------------------------------------------
3 files changed, 16 insertions(+), 48 deletions(-)
diff --git a/usr/host.c b/usr/host.c
index f2052d3..6333490 100644
--- a/usr/host.c
+++ b/usr/host.c
@@ -274,6 +274,7 @@ int host_info_print(int info_level, uint32_t host_no)
printf("iSCSI Transport Class version %s\n",
version);
printf("version %s\n", ISCSI_VERSION_STR);
+ free(version);
}
flags |= SESSION_INFO_SCSI_DEVS;
diff --git a/usr/session_info.c b/usr/session_info.c
index 2f48e65..89422d8 100644
--- a/usr/session_info.c
+++ b/usr/session_info.c
@@ -390,6 +390,7 @@ int session_info_print(int info_level, struct session_info *info, int do_show)
printf("iSCSI Transport Class version %s\n",
version);
printf("version %s\n", ISCSI_VERSION_STR);
+ free(version);
}
flags |= (SESSION_INFO_SCSI_DEVS | SESSION_INFO_HOST_DEVS);
diff --git a/usr/sysfs.c b/usr/sysfs.c
index 6520bf6..efd4f74 100644
--- a/usr/sysfs.c
+++ b/usr/sysfs.c
@@ -63,15 +63,6 @@ char sysfs_path[PATH_SIZE];
/* device cache */
static LIST_HEAD(dev_list);
-/* attribute value cache */
-static LIST_HEAD(attr_list);
-
-struct sysfs_attr {
- struct list_head node;
- char path[PATH_SIZE];
- char *value; /* points to value_local if value is cached */
- char value_local[NAME_SIZE];
-};
int sysfs_init(void)
{
const char *env;
@@ -85,22 +76,14 @@ int sysfs_init(void)
dbg("sysfs_path='%s'", sysfs_path);
INIT_LIST_HEAD(&dev_list);
- INIT_LIST_HEAD(&attr_list);
return 0;
}
void sysfs_cleanup(void)
{
- struct sysfs_attr *attr_loop;
- struct sysfs_attr *attr_temp;
struct sysfs_device *dev_loop;
struct sysfs_device *dev_temp;
- list_for_each_entry_safe(attr_loop, attr_temp, &attr_list, node) {
- list_del_init(&attr_loop->node);
- free(attr_loop);
- }
-
list_for_each_entry_safe(dev_loop, dev_temp, &dev_list, node) {
list_del_init(&dev_loop->node);
free(dev_loop);
@@ -355,10 +338,7 @@ struct sysfs_device *sysfs_device_get_parent_with_subsystem(struct sysfs_device
char *sysfs_attr_get_value(const char *devpath, const char *attr_name)
{
char path_full[PATH_SIZE];
- const char *path;
char value[NAME_SIZE];
- struct sysfs_attr *attr_loop;
- struct sysfs_attr *attr;
struct stat statbuf;
int fd;
ssize_t size;
@@ -368,29 +348,10 @@ char *sysfs_attr_get_value(const char *devpath, const char *attr_name)
sysfs_len = strlcpy(path_full, sysfs_path, sizeof(path_full));
if(sysfs_len >= sizeof(path_full))
sysfs_len = sizeof(path_full) - 1;
- path = &path_full[sysfs_len];
strlcat(path_full, devpath, sizeof(path_full));
strlcat(path_full, "/", sizeof(path_full));
strlcat(path_full, attr_name, sizeof(path_full));
- /* look for attribute in cache */
- list_for_each_entry(attr_loop, &attr_list, node) {
- if (strcmp(attr_loop->path, path) == 0) {
- dbg("found in cache '%s'", attr_loop->path);
- return attr_loop->value;
- }
- }
-
- /* store attribute in cache (also negatives are kept in cache) */
- dbg("new uncached attribute '%s'", path_full);
- attr = malloc(sizeof(struct sysfs_attr));
- if (attr == NULL)
- return NULL;
- memset(attr, 0x00, sizeof(struct sysfs_attr));
- strlcpy(attr->path, path, sizeof(attr->path));
- dbg("add to cache '%s'", path_full);
- list_add(&attr->node, &attr_list);
-
if (lstat(path_full, &statbuf) != 0) {
dbg("stat '%s' failed: %s", path_full, strerror(errno));
goto out;
@@ -408,8 +369,7 @@ char *sysfs_attr_get_value(const char *devpath, const char *attr_name)
pos = strrchr(link_target, '/');
if (pos != NULL) {
dbg("cache '%s' with link value '%s'", path_full, value);
- strlcpy(attr->value_local, &pos[1], sizeof(attr->value_local));
- attr->value = attr->value_local;
+ strlcpy(value, &pos[1], NAME_SIZE);
}
}
goto out;
@@ -439,12 +399,8 @@ char *sysfs_attr_get_value(const char *devpath, const char *attr_name)
/* got a valid value, store and return it */
value[size] = '\0';
remove_trailing_chars(value, '\n');
- dbg("cache '%s' with attribute value '%s'", path_full, value);
- strlcpy(attr->value_local, value, sizeof(attr->value_local));
- attr->value = attr->value_local;
-
out:
- return attr->value;
+ return strdup(value);
}
int sysfs_lookup_devpath_by_subsys_id(char *devpath_full, size_t len, const char *subsystem, const char *id)
@@ -567,8 +523,10 @@ char *sysfs_get_value(const char *id, char *subsys, char *param)
}
if (!strncmp(sysfs_value, "<NULL>", 6) ||
- !strncmp(sysfs_value, "(null)", 6))
+ !strncmp(sysfs_value, "(null)", 6)) {
+ free(sysfs_value);
return NULL;
+ }
return sysfs_value;
}
@@ -585,6 +543,7 @@ int sysfs_get_uint(char *id, char *subsys, char *param,
errno = 0;
*value = strtoul(sysfs_value, NULL, 0);
+ free(sysfs_value);
if (errno)
return errno;
return 0;
@@ -600,6 +559,7 @@ int sysfs_get_int(const char *id, char *subsys, char *param, int *value)
return EIO;
*value = atoi(sysfs_value);
+ free(sysfs_value);
return 0;
}
@@ -619,6 +579,7 @@ int sysfs_get_str(char *id, char *subsys, char *param, char *value,
sysfs_value[len - 1] = '\0';
strncpy(value, sysfs_value, value_size);
value[value_size - 1] = '\0';
+ free(sysfs_value);
return 0;
}
@@ -631,8 +592,11 @@ int sysfs_get_uint64(char *id, char *subsys, char *param, uint64_t *value)
if (!sysfs_value)
return EIO;
- if (sscanf(sysfs_value, "%" PRIu64 "\n", value) != 1)
+ if (sscanf(sysfs_value, "%" PRIu64 "\n", value) != 1) {
+ free(sysfs_value);
return EINVAL;
+ }
+ free(sysfs_value);
return 0;
}
@@ -647,6 +611,7 @@ int sysfs_get_uint8(char *id, char *subsys, char *param,
return EIO;
*value = (uint8_t)atoi(sysfs_value);
+ free(sysfs_value);
return 0;
}
@@ -661,6 +626,7 @@ int sysfs_get_uint16(char *id, char *subsys, char *param,
return EIO;
*value = (uint16_t)atoi(sysfs_value);
+ free(sysfs_value);
return 0;
}
--
2.5.0

2
sources
View File

@ -1 +1 @@
de2464098c3ffc30bb37fc511616a521 open-iscsi-4c1f2d9.tar.gz SHA512 (open-iscsi-86e8892.tar.gz) = bdbce29d98e92d112f804271cd2e28be27378533e5a934004d852d6874fc1fa86228faa7ce20dd2a392731d78ec010c7b8303aa139c4552ff4b8d06a750ba450