.device-mapper-multipath.metadata

@@ -1 +1 @@
-b52c2be340449664f0a122070838f6d8edd42e4a SOURCES/multipath-tools-0.8.4.tgz
+067d668de8e3a70b7c176bbf0c0616d5835bbe44 SOURCES/multipath-tools-0.8.7.tgz

.gitignore

@@ -1 +1 @@
-SOURCES/multipath-tools-0.8.4.tgz
+SOURCES/multipath-tools-0.8.7.tgz

SOURCES/0001-libmultipath-assign-variable-to-make-gcc-happy.patch

@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Tue, 17 Mar 2020 17:28:24 -0500
-Subject: [PATCH] libmultipath: assign variable to make gcc happy
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There is nothing wrong with is_queueing not being set at the start
-of __set_no_path_retry(), it will always get set before it is accessed,
-but gcc 8.2.1 is failing with
-
-structs_vec.c: In function ‘__set_no_path_retry’:
-structs_vec.c:339:7: error: ‘is_queueing’ may be used uninitialized in
-this function [-Werror=maybe-uninitialized]
-  bool is_queueing;
-       ^~~~~~~~~~~
-
-so, assign a value to make it happy.
-
-Reviewed-by: Martin Wilck <mwilck@suse.com>
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/structs_vec.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libmultipath/structs_vec.c b/libmultipath/structs_vec.c
-index 3dbbaa0f..077f2e42 100644
---- a/libmultipath/structs_vec.c
-+++ b/libmultipath/structs_vec.c
-@@ -336,7 +336,7 @@ static void leave_recovery_mode(struct multipath *mpp)
- 
- void __set_no_path_retry(struct multipath *mpp, bool check_features)
- {
--	bool is_queueing;
-+	bool is_queueing = false; /* assign a value to make gcc happy */
- 
- 	check_features = check_features && mpp->features != NULL;
- 	if (check_features)
--- 
-2.17.2
-

SOURCES/0001-multipath-tools-add-info-about-IO-affinity-path-sele.patch

@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Xose Vazquez Perez <xose.vazquez@gmail.com>
+Date: Wed, 8 Sep 2021 22:33:54 +0200
+Subject: [PATCH] multipath-tools: add info about IO affinity path selector to
+ manpage
+
+Added in 5.11: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e4d2e82b2300b03f66b3ca8417590c86e661fab1
+
+Cc: Mike Christie <michael.christie@oracle.com>
+Cc: Martin Wilck <mwilck@suse.com>
+Cc: Benjamin Marzinski <bmarzins@redhat.com>
+Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
+Cc: DM-DEVEL ML <dm-devel@redhat.com>
+Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
+
+Reviewed-by: Martin Wilck <mwilck@suse.com>
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ multipath/multipath.conf.5 | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
+index d6b8c7f6..42a15ffd 100644
+--- a/multipath/multipath.conf.5
++++ b/multipath/multipath.conf.5
+@@ -6,7 +6,7 @@
+ .\"
+ .\" ----------------------------------------------------------------------------
+ .
+-.TH MULTIPATH.CONF 5 2018-05-21 Linux
++.TH MULTIPATH.CONF 5 2021-09-08 Linux
+ .
+ .
+ .\" ----------------------------------------------------------------------------
+@@ -210,6 +210,10 @@ of outstanding I/O to the path and its relative throughput.
+ estimation of future service time based on the history of previous I/O submitted
+ to each path.
+ .TP
++.I "io-affinity 0"
++(Since 5.11 kernel) Choose the path for the next bunch of I/O based on a CPU to
++path mapping the user passes in and what CPU we are executing on.
++.TP
+ The default is: \fBservice-time 0\fR
+ .RE
+ .

SOURCES/0002-libmutipath-don-t-close-fd-on-dm_lib_release.patch

@@ -1,66 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Sat, 21 Mar 2020 23:49:59 -0500
-Subject: [PATCH] libmutipath: don't close fd on dm_lib_release
-
-If dm_hold_control_open() isn't set, when dm_lib_release() is called, it
-will close the control fd. The control fd will get re-opened on the next
-dm_task_run() call, but if there is a dm_task_run() call already
-in progress in another thread, it can fail. Since many of the
-device-mapper callouts happen with the vecs lock held, this wasn't too
-noticeable, but there is code that calls dm_task_run() without the
-vecs lock held, notably the dmevent waiter code.
-
-Since, as Martin pointed out, dm_hold_control_open() hasn't always
-existed in libdevmapper, check if it's supported on compilation,
-and update the version requirements if so.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/Makefile    | 4 ++++
- libmultipath/devmapper.c | 7 ++++++-
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/libmultipath/Makefile b/libmultipath/Makefile
-index e5651e49..ad690a49 100644
---- a/libmultipath/Makefile
-+++ b/libmultipath/Makefile
-@@ -36,6 +36,10 @@ ifneq ($(call check_func,dm_task_deferred_remove,/usr/include/libdevmapper.h),0)
- 	CFLAGS += -DLIBDM_API_DEFERRED
- endif
- 
-+ifneq ($(call check_func,dm_hold_control_dev,/usr/include/libdevmapper.h),0)
-+	CFLAGS += -DLIBDM_API_HOLD_CONTROL
-+endif
-+
- OBJS = memory.o parser.o vector.o devmapper.o callout.o \
- 	hwtable.o blacklist.o util.o dmparser.o config.o \
- 	structs.o discovery.o propsel.o dict.o \
-diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
-index bed8ddc6..13a1cf53 100644
---- a/libmultipath/devmapper.c
-+++ b/libmultipath/devmapper.c
-@@ -108,7 +108,9 @@ dm_lib_prereq (void)
- {
- 	char version[64];
- 	int v[3];
--#if defined(LIBDM_API_DEFERRED)
-+#if defined(LIBDM_API_HOLD_CONTROL)
-+	int minv[3] = {1, 2, 111};
-+#elif defined(LIBDM_API_DEFERRED)
- 	int minv[3] = {1, 2, 89};
- #elif defined(DM_SUBSYSTEM_UDEV_FLAG0)
- 	int minv[3] = {1, 2, 82};
-@@ -254,6 +256,9 @@ void libmp_dm_init(void)
- 	memcpy(conf->version, version, sizeof(version));
- 	put_multipath_config(conf);
- 	dm_init(verbosity);
-+#ifdef LIBDM_API_HOLD_CONTROL
-+	dm_hold_control_dev(1);
-+#endif
- 	dm_udev_set_sync_support(libmp_dm_udev_sync);
- }
- 
--- 
-2.17.2
-

SOURCES/0002-multipathd-fix-missing-persistent-reseravtion-for-ac.patch

@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: lixiaokeng <lixiaokeng@huawei.com>
+Date: Mon, 13 Sep 2021 10:43:14 +0800
+Subject: [PATCH] multipathd: fix missing persistent reseravtion for active
+ path
+
+There are two paths(sucu as sda and adb) for one LUN. The two
+paths log in, but before the two uevents have been processed
+(for example there are many uevent), users use multipathd add
+path /dev/sda to cause mpatha and use mpathpersist -o -I to
+register prkey for mpatha. The add map uevent is after add path
+uevent, the the uevent(add sdb) will delay and missing persistent
+reseravtion check.
+
+Here, we add persistent reseravtion check in update_map() which
+is called ev_add_map().
+
+Signed-off-by: Lixiaokeng <lixiaokeng@huawei.com>
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ multipathd/main.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/multipathd/main.c b/multipathd/main.c
+index 3aff241d..1defeaf1 100644
+--- a/multipathd/main.c
++++ b/multipathd/main.c
+@@ -490,6 +490,8 @@ update_map (struct multipath *mpp, struct vectors *vecs, int new_map)
+ {
+ 	int retries = 3;
+ 	char *params __attribute__((cleanup(cleanup_charp))) = NULL;
++	struct path *pp;
++	int i;
+ 
+ retry:
+ 	condlog(4, "%s: updating new map", mpp->alias);
+@@ -502,6 +504,15 @@ retry:
+ 	verify_paths(mpp);
+ 	mpp->action = ACT_RELOAD;
+ 
++	if (mpp->prflag) {
++		vector_foreach_slot(mpp->paths, pp, i) {
++			if ((pp->state == PATH_UP)  || (pp->state == PATH_GHOST)) {
++				/* persistent reseravtion check*/
++				mpath_pr_event_handle(pp);
++			}
++		}
++	}
++
+ 	if (setup_map(mpp, &params, vecs)) {
+ 		condlog(0, "%s: failed to setup new map in update", mpp->alias);
+ 		retries = -1;

SOURCES/0003-libmultipath-allow-force-reload-with-no-active-paths.patch

@@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Thu, 19 Mar 2020 22:17:51 -0500
-Subject: [PATCH] libmultipath: allow force reload with no active paths
-
-If the partition information has changed on multipath devices (say,
-because it was updated on another node that has access to the same
-storage), users expect that running "multipathd reconfigure" will update
-that.  However, if the checkers for the multipath device are pending for
-too long when the the device is reconfigured, multipathd will give up
-waiting for them, and refuse to reload the device, since there are no
-active paths. This means that no kpartx update will be triggered.
-
-Multipath is fully capable of reloading a multipath device that has no
-active paths. This has been possible for years. If multipath is supposed
-to reload the device, it should do so, even if there are no active paths.
-
-Generally, when multipath is force reloaded, kpartx will be updated.
-However when a device is reloaded with no paths, the udev rules won't
-run kpartx.  But they also weren't running kpartx when the first valid
-path appeared, even though the dm activation rules get run in this case.
-This changes 11-dm-mpath.rules to run kpartx when a device goes from no
-usable paths to having usable paths.
-
-Reviewed-by: Martin Wilck <mwilck@suse.com>
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/configure.c    | 6 ------
- multipath/11-dm-mpath.rules | 2 +-
- 2 files changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/libmultipath/configure.c b/libmultipath/configure.c
-index c95848a0..96c79610 100644
---- a/libmultipath/configure.c
-+++ b/libmultipath/configure.c
-@@ -710,12 +710,6 @@ select_action (struct multipath * mpp, vector curmp, int force_reload)
- 		return;
- 	}
- 
--	if (pathcount(mpp, PATH_UP) == 0) {
--		mpp->action = ACT_IMPOSSIBLE;
--		condlog(3, "%s: set ACT_IMPOSSIBLE (no usable path)",
--			mpp->alias);
--		return;
--	}
- 	if (force_reload) {
- 		mpp->force_udev_reload = 1;
- 		mpp->action = ACT_RELOAD;
-diff --git a/multipath/11-dm-mpath.rules b/multipath/11-dm-mpath.rules
-index 07320a14..cd522e8c 100644
---- a/multipath/11-dm-mpath.rules
-+++ b/multipath/11-dm-mpath.rules
-@@ -75,7 +75,7 @@ ENV{MPATH_DEVICE_READY}=="0", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}="1"
- ENV{MPATH_DEVICE_READY}!="0", ENV{.MPATH_DEVICE_READY_OLD}=="0",\
- 	ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}="$env{DM_DISABLE_OTHER_RULES_FLAG_OLD}",\
- 	ENV{DM_DISABLE_OTHER_RULES_FLAG_OLD}="",\
--	ENV{DM_ACTIVATION}="1"
-+	ENV{DM_ACTIVATION}="1", ENV{MPATH_UNCHANGED}="0"
- 
- # The code to check multipath state ends here. We need to set
- # properties and symlinks regardless whether the map is usable or
--- 
-2.17.2
-

SOURCES/0003-multipath-tools-minor-fixes-to-multipath.conf.5-man-.patch

@@ -0,0 +1,48 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Xose Vazquez Perez <xose.vazquez@gmail.com>
+Date: Thu, 16 Sep 2021 00:44:49 +0200
+Subject: [PATCH] multipath-tools: minor fixes to multipath.conf.5 man page
+
+Cc: Martin Wilck <mwilck@suse.com>
+Cc: Benjamin Marzinski <bmarzins@redhat.com>
+Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
+Cc: DM-DEVEL ML <dm-devel@redhat.com>
+Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ multipath/multipath.conf.5 | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
+index 42a15ffd..c74129bd 100644
+--- a/multipath/multipath.conf.5
++++ b/multipath/multipath.conf.5
+@@ -1,9 +1,9 @@
+ .\" ----------------------------------------------------------------------------
+-.\" Update the date below if you make any significant change.
+ .\" Make sure there are no errors with:
+ .\" groff -z -wall -b -e -t multipath/multipath.conf.5
+ .\" man --warnings -E UTF-8 -l -Tutf8 -Z multipath/multipath.conf.5 >/dev/null
+ .\"
++.\" Update the date below if you make any significant change.
+ .\" ----------------------------------------------------------------------------
+ .
+ .TH MULTIPATH.CONF 5 2021-09-08 Linux
+@@ -189,7 +189,7 @@ The default is: \fB<system dependent>\fR
+ .TP
+ .B path_selector
+ The default path selector algorithm to use; they are offered by the
+-kernel multipath target. There are three selector algorithms:
++kernel multipath target:
+ .RS
+ .TP 12
+ .I "round-robin 0"
+@@ -206,7 +206,7 @@ of outstanding I/O to the path.
+ of outstanding I/O to the path and its relative throughput.
+ .TP
+ .I "historical-service-time 0"
+-(Since 5.8 kernel) Choose the path for the next bunch of IOs based on the
++(Since 5.8 kernel) Choose the path for the next bunch of I/O based on the
+ estimation of future service time based on the history of previous I/O submitted
+ to each path.
+ .TP

SOURCES/0004-libmpathpersist-depend-on-libmultipath.patch

@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Wed, 6 May 2020 09:35:47 +0200
-Subject: [PATCH] libmpathpersist: depend on libmultipath
-
-Without this the build fails with:
-
-/usr/bin/ld: cannot find -lmultipath
-
-Signed-off-by: Christian Hesse <mail@eworm.de>
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 1dee3680..ba1d73ba 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,7 +28,7 @@ all:	$(BUILDDIRS)
- $(BUILDDIRS):
- 	$(MAKE) -C $@
- 
--multipath multipathd mpathpersist: libmultipath
-+libmpathpersist multipath multipathd mpathpersist: libmultipath
- mpathpersist:  libmpathpersist
- 
- $(BUILDDIRS.clean):
--- 
-2.17.2
-

SOURCES/0004-multipath-tools-make-IBM-XIV-config-work-with-alua-a.patch

@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Xose Vazquez Perez <xose.vazquez@gmail.com>
+Date: Sat, 25 Sep 2021 00:27:36 +0200
+Subject: [PATCH] multipath-tools: make IBM/XIV config work with alua and
+ multibus
+
+And add recommended pgfailback value.
+
+ALUA is supported since XIV_Gen2 and microcode 10.2.1
+(All ports across all controllers in single Target Port Group)
+
+https://www.ibm.com/support/pages/ibm-flashsystem%C2%AE-a9000-and-a9000r-hyperswap-solution-deployment-linux%C2%AE-ibm-z-systems%C2%AE
+https://www.google.com/search?q=%222810XIV%22+%22path_grouping_policy%22+site%3Aibm.com
+
+Cc: Martin Wilck <mwilck@suse.com>
+Cc: Benjamin Marzinski <bmarzins@redhat.com>
+Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
+Cc: DM-DEVEL ML <dm-devel@redhat.com>
+Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
+Reviewed-by: Martin Wilck <mwilck@suse.com>
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ libmultipath/hwtable.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
+index 0caac0da..72f81c60 100644
+--- a/libmultipath/hwtable.c
++++ b/libmultipath/hwtable.c
+@@ -712,7 +712,8 @@ static struct hwentry default_hw[] = {
+ 		.vendor        = "(XIV|IBM)",
+ 		.product       = "(NEXTRA|2810XIV)",
+ 		.no_path_retry = NO_PATH_RETRY_QUEUE,
+-		.pgpolicy      = MULTIBUS,
++		.pgpolicy      = GROUP_BY_PRIO,
++		.pgfailback    = 15,
+ 	},
+ 	{
+ 		/* TMS RamSan / FlashSystem 710/720/810/820/840/900 */

SOURCES/0005-multipath-tools-Makefile-more-dependency-fixes-for-p.patch

@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martin Wilck <mwilck@suse.com>
-Date: Tue, 12 May 2020 00:39:21 +0200
-Subject: [PATCH] multipath-tools: Makefile: more dependency fixes for parallel
- build
-
-Extend the late fixes from Christian.
-
-Cc: Christian Hesse <mail@eworm.de>
-Signed-off-by: Martin Wilck <mwilck@suse.com>
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- Makefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ba1d73ba..fec3b73b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,8 +28,9 @@ all:	$(BUILDDIRS)
- $(BUILDDIRS):
- 	$(MAKE) -C $@
- 
--libmpathpersist multipath multipathd mpathpersist: libmultipath
--mpathpersist:  libmpathpersist
-+libmultipath libdmmp: libmpathcmd
-+libmpathpersist multipath multipathd: libmultipath
-+mpathpersist multipathd:  libmpathpersist
- 
- $(BUILDDIRS.clean):
- 	$(MAKE) -C ${@:.clean=} clean
--- 
-2.17.2
-

SOURCES/0005-multipathd.socket-add-missing-conditions-from-servic.patch

@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Luca BRUNO <luca.bruno@coreos.com>
+Date: Fri, 24 Sep 2021 09:34:01 +0000
+Subject: [PATCH] multipathd.socket: add missing conditions from service unit
+
+This aligns 'multipathd' socket and service units, by adding the
+start conditions that are set on the service but not on the socket.
+It should help avoiding situations where the socket unit ends up
+marked as failed after hitting its retry-limit.
+
+Fixes: https://github.com/opensvc/multipath-tools/issues/15
+Signed-off-by: Luca BRUNO <luca.bruno@coreos.com>
+Reviewed-by: Martin Wilck <mwilck@suse.com>
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ multipathd/multipathd.socket | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/multipathd/multipathd.socket b/multipathd/multipathd.socket
+index 0ed4a1f7..c777e5e3 100644
+--- a/multipathd/multipathd.socket
++++ b/multipathd/multipathd.socket
+@@ -1,6 +1,9 @@
+ [Unit]
+ Description=multipathd control socket
+ DefaultDependencies=no
++ConditionKernelCommandLine=!nompath
++ConditionKernelCommandLine=!multipath=off
++ConditionVirtualization=!container
+ Before=sockets.target
+ 
+ [Socket]

SOURCES/0006-multipath-tools-Makefile.inc-set-Wno-error-clobbered.patch

@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martin Wilck <mwilck@suse.com>
-Date: Tue, 12 May 2020 00:39:24 +0200
-Subject: [PATCH] multipath-tools: Makefile.inc: set -Wno-error=clobbered
-
-We need to ignore -Wclobbered because gcc has trouble dealing with glibc's
-implementation of pthread_cleanup_push().
-
-For some variants of gcc, -Wno-clobbered alone isn't enough if -Werror is also
-set. Compilation with -Wno-error=clobbered works, though.
-
-Signed-off-by: Martin Wilck <mwilck@suse.com>
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- Makefile.inc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.inc b/Makefile.inc
-index d4d1e0dd..9060ac9b 100644
---- a/Makefile.inc
-+++ b/Makefile.inc
-@@ -91,7 +91,7 @@ TEST_CC_OPTION = $(shell \
- 
- STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector)
- ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers,)
--WNOCLOBBERED := $(call TEST_CC_OPTION,-Wno-clobbered,)
-+WNOCLOBBERED := $(call TEST_CC_OPTION,-Wno-clobbered -Wno-error=clobbered,)
- 
- OPTFLAGS	= -O2 -g -pipe -Werror -Wall -Wextra -Wformat=2 -Werror=implicit-int \
- 		  -Werror=implicit-function-declaration -Werror=format-security \
--- 
-2.17.2
-

SOURCES/0006-multipath-tools-make-IBM-2107900-DS8000-config-work-.patch

@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Xose Vazquez Perez <xose.vazquez@gmail.com>
+Date: Tue, 28 Sep 2021 18:52:10 +0200
+Subject: [PATCH] multipath-tools: make IBM/2107900 (DS8000) config work with
+ alua and multibus
+
+ALUA is supported since the beginning:
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/device_handler/scsi_dh_alua.c?id=057ea7c9683c3d684128cced796f03c179ecf1c2#n683
+
+... the DS8000 is an Asymmetric Logical Unit Access (ALUA) capable storage array,
+pag#160(144): https://www.redbooks.ibm.com/redbooks/pdfs/sg248887.pdf
+
+kernel log:
+https://marc.info/?l=linux-scsi&m=156407413807511&q=mbox
+
+Cc: Martin Wilck <mwilck@suse.com>
+Cc: Benjamin Marzinski <bmarzins@redhat.com>
+Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
+Cc: DM-DEVEL ML <dm-devel@redhat.com>
+Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
+Reviewed-by: Martin Wilck <mwilck@suse.com>
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ libmultipath/hwtable.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
+index 72f81c60..f115c4f9 100644
+--- a/libmultipath/hwtable.c
++++ b/libmultipath/hwtable.c
+@@ -656,7 +656,8 @@ static struct hwentry default_hw[] = {
+ 		.vendor        = "IBM",
+ 		.product       = "^2107900",
+ 		.no_path_retry = NO_PATH_RETRY_QUEUE,
+-		.pgpolicy      = MULTIBUS,
++		.pgpolicy      = GROUP_BY_PRIO,
++		.pgfailback    = -FAILBACK_IMMEDIATE,
+ 	},
+ 	{
+ 		// Storwize V5000 and V7000 lines / SAN Volume Controller (SVC) / Flex System V7000 /

SOURCES/0007-libmultipath-discovery.c-use-z-qualifier-for-size_t.patch

@@ -1,91 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martin Wilck <mwilck@suse.com>
-Date: Tue, 12 May 2020 00:39:25 +0200
-Subject: [PATCH] libmultipath: discovery.c: use %z qualifier for size_t
-
-Otherwise compilation for 32bit targets spits out warnings.
-
-Signed-off-by: Martin Wilck <mwilck@suse.com>
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/discovery.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
-index ee3290cd..ffec5162 100644
---- a/libmultipath/discovery.c
-+++ b/libmultipath/discovery.c
-@@ -986,7 +986,7 @@ parse_vpd_pg80(const unsigned char *in, char *out, size_t out_len)
- 	}
- 
- 	if (len >= out_len) {
--		condlog(2, "vpd pg80 overflow, %lu/%lu bytes required",
-+		condlog(2, "vpd pg80 overflow, %zu/%zu bytes required",
- 			len + 1, out_len);
- 		len = out_len - 1;
- 	}
-@@ -1087,7 +1087,7 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len,
- 
- 		len = sprintf(out, "%d", vpd_type);
- 		if (2 * vpd_len >= out_len - len) {
--			condlog(1, "%s: WWID overflow, type %d, %lu/%lu bytes required",
-+			condlog(1, "%s: WWID overflow, type %d, %zu/%zu bytes required",
- 				__func__, vpd_type,
- 				2 * vpd_len + len + 1, out_len);
- 			vpd_len = (out_len - len - 1) / 2;
-@@ -1096,7 +1096,7 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len,
- 			len += sprintf(out + len,
- 				       "%02x", vpd[i]);
- 	} else if (vpd_type == 0x8 && vpd_len < 4) {
--		condlog(1, "%s: VPD length %lu too small for designator type 8",
-+		condlog(1, "%s: VPD length %zu too small for designator type 8",
- 			__func__, vpd_len);
- 		return -EINVAL;
- 	} else if (vpd_type == 0x8) {
-@@ -1112,7 +1112,7 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len,
- 		while (len > 2 && vpd[len - 2] == '\0')
- 			--len;
- 		if (len > out_len - 1) {
--			condlog(1, "%s: WWID overflow, type 8/%c, %lu/%lu bytes required",
-+			condlog(1, "%s: WWID overflow, type 8/%c, %zu/%zu bytes required",
- 				__func__, out[0], len + 1, out_len);
- 			len = out_len - 1;
- 		}
-@@ -1136,7 +1136,7 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len,
- 		while ((p = memchr(vpd, ' ', vpd_len))) {
- 			p_len = p - vpd;
- 			if (len + p_len > out_len - 1) {
--				condlog(1, "%s: WWID overflow, type 1, %lu/%lu bytes required",
-+				condlog(1, "%s: WWID overflow, type 1, %zu/%zu bytes required",
- 					__func__, len + p_len, out_len);
- 				p_len = out_len - len - 1;
- 			}
-@@ -1162,7 +1162,7 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len,
- 		p_len = vpd_len;
- 		if (p_len > 0 && len < out_len - 1) {
- 			if (len + p_len > out_len - 1) {
--				condlog(1, "%s: WWID overflow, type 1, %lu/%lu bytes required",
-+				condlog(1, "%s: WWID overflow, type 1, %zu/%zu bytes required",
- 					__func__, len + p_len + 1, out_len);
- 				p_len = out_len - len - 1;
- 			}
-@@ -1186,14 +1186,14 @@ parse_vpd_c0_hp3par(const unsigned char *in, size_t in_len,
- 
- 	memset(out, 0x0, out_len);
- 	if (in_len <= 4 || (in[4] > 3 && in_len < 44)) {
--		condlog(3, "HP/3PAR vendor specific VPD page length too short: %lu", in_len);
-+		condlog(3, "HP/3PAR vendor specific VPD page length too short: %zu", in_len);
- 		return -EINVAL;
- 	}
- 	if (in[4] <= 3) /* revision must be > 3 to have Vomlume Name */
- 		return -ENODATA;
- 	len = get_unaligned_be32(&in[40]);
- 	if (len > out_len || len + 44 > in_len) {
--		condlog(3, "HP/3PAR vendor specific Volume name too long: %lu",
-+		condlog(3, "HP/3PAR vendor specific Volume name too long: %zu",
- 			len);
- 		return -EINVAL;
- 	}
--- 
-2.17.2
-

SOURCES/0007-multipath-tools-make-EMC-SYMMETRIX-config-work-with-.patch

@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Xose Vazquez Perez <xose.vazquez@gmail.com>
+Date: Tue, 28 Sep 2021 19:20:59 +0200
+Subject: [PATCH] multipath-tools: make EMC/SYMMETRIX config work with alua and
+ multibus
+
+ALUA is supported since VMAX3 and HYPERMAX OS 5977.811.784, pag#113:
+https://www.delltechnologies.com/en-us/collaterals/unauth/technical-guides-support-information/products/storage-2/docu5128.pdf
+
+Cc: Martin Wilck <mwilck@suse.com>
+Cc: Benjamin Marzinski <bmarzins@redhat.com>
+Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
+Cc: DM-DEVEL ML <dm-devel@redhat.com>
+Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
+Reviewed-by: Martin Wilck <mwilck@suse.com>
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ libmultipath/hwtable.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
+index f115c4f9..7095aaf1 100644
+--- a/libmultipath/hwtable.c
++++ b/libmultipath/hwtable.c
+@@ -329,8 +329,9 @@ static struct hwentry default_hw[] = {
+ 		/* Symmetrix / DMX / VMAX / PowerMax */
+ 		.vendor        = "EMC",
+ 		.product       = "SYMMETRIX",
+-		.pgpolicy      = MULTIBUS,
++		.pgpolicy      = GROUP_BY_PRIO,
+ 		.no_path_retry = 6,
++		.pgfailback    = -FAILBACK_IMMEDIATE,
+ 	},
+ 	{
+ 		/* DGC CLARiiON CX/AX / VNX and Unity */

SOURCES/0008-libmultipath-eliminate-more-signed-unsigned-comparis.patch

@@ -1,185 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martin Wilck <mwilck@suse.com>
-Date: Tue, 12 May 2020 00:39:26 +0200
-Subject: [PATCH] libmultipath: eliminate more signed/unsigned comparisons
-
-Fix some more compiler warnings about signed/unsigned comparison.
-I've observed these only on 32bit builds, therefore they went unnoticed
-before.
-
-Signed-off-by: Martin Wilck <mwilck@suse.com>
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/print.c                  | 12 ++++++------
- libmultipath/prioritizers/alua_spc3.h |  2 +-
- multipathd/cli_handlers.c             | 20 ++++++++++----------
- multipathd/main.c                     |  2 +-
- 4 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/libmultipath/print.c b/libmultipath/print.c
-index b944ef32..298b3764 100644
---- a/libmultipath/print.c
-+++ b/libmultipath/print.c
-@@ -1958,25 +1958,25 @@ char *snprint_config(const struct config *conf, int *len,
- 		}
- 
- 		c = reply + snprint_defaults(conf, reply, maxlen);
--		if ((c - reply) == maxlen)
-+		if (c == reply + maxlen)
- 			continue;
- 
- 		c += snprint_blacklist(conf, c, reply + maxlen - c);
--		if ((c - reply) == maxlen)
-+		if (c == reply + maxlen)
- 			continue;
- 
- 		c += snprint_blacklist_except(conf, c, reply + maxlen - c);
--		if ((c - reply) == maxlen)
-+		if (c == reply + maxlen)
- 			continue;
- 
- 		c += snprint_hwtable(conf, c, reply + maxlen - c,
- 				     hwtable ? hwtable : conf->hwtable);
--		if ((c - reply) == maxlen)
-+		if (c == reply + maxlen)
- 			continue;
- 
- 		c += snprint_overrides(conf, c, reply + maxlen - c,
- 				       conf->overrides);
--		if ((c - reply) == maxlen)
-+		if (c == reply + maxlen)
- 			continue;
- 
- 		if (VECTOR_SIZE(conf->mptable) > 0 ||
-@@ -1984,7 +1984,7 @@ char *snprint_config(const struct config *conf, int *len,
- 			c += snprint_mptable(conf, c, reply + maxlen - c,
- 					     mpvec);
- 
--		if ((c - reply) < maxlen) {
-+		if (c < reply + maxlen) {
- 			if (len)
- 				*len = c - reply;
- 			return reply;
-diff --git a/libmultipath/prioritizers/alua_spc3.h b/libmultipath/prioritizers/alua_spc3.h
-index 18b495ef..7ba2cf4c 100644
---- a/libmultipath/prioritizers/alua_spc3.h
-+++ b/libmultipath/prioritizers/alua_spc3.h
-@@ -284,7 +284,7 @@ struct rtpg_data {
- #define RTPG_FOR_EACH_PORT_GROUP(p, g) \
- 		for( \
- 			g = &(p->data[0]); \
--			(((char *) g) - ((char *) p)) < get_unaligned_be32(p->length); \
-+			((char *) g) < ((char *) p) + get_unaligned_be32(p->length); \
- 			g = (struct rtpg_tpg_dscr *) ( \
- 				((char *) g) + \
- 				sizeof(struct rtpg_tpg_dscr) + \
-diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c
-index 7d878c88..31c3d9fd 100644
---- a/multipathd/cli_handlers.c
-+++ b/multipathd/cli_handlers.c
-@@ -66,7 +66,7 @@ show_paths (char ** r, int * len, struct vectors * vecs, char * style,
- 		c += snprint_foreign_paths(c, reply + maxlen - c,
- 					   style, pretty);
- 
--		again = ((c - reply) == (maxlen - 1));
-+		again = (c == reply + maxlen - 1);
- 
- 		REALLOC_REPLY(reply, again, maxlen);
- 	}
-@@ -102,7 +102,7 @@ show_path (char ** r, int * len, struct vectors * vecs, struct path *pp,
- 
- 		c += snprint_path(c, reply + maxlen - c, style, pp, 0);
- 
--		again = ((c - reply) == (maxlen - 1));
-+		again = (c == reply + maxlen - 1);
- 
- 		REALLOC_REPLY(reply, again, maxlen);
- 	}
-@@ -131,7 +131,7 @@ show_map_topology (char ** r, int * len, struct multipath * mpp,
- 		c = reply;
- 
- 		c += snprint_multipath_topology(c, reply + maxlen - c, mpp, 2);
--		again = ((c - reply) == (maxlen - 1));
-+		again = (c == reply + maxlen - 1);
- 
- 		REALLOC_REPLY(reply, again, maxlen);
- 	}
-@@ -171,7 +171,7 @@ show_maps_topology (char ** r, int * len, struct vectors * vecs)
- 		}
- 		c += snprint_foreign_topology(c, reply + maxlen - c, 2);
- 
--		again = ((c - reply) == (maxlen - 1));
-+		again = (c == reply + maxlen - 1);
- 
- 		REALLOC_REPLY(reply, again, maxlen);
- 	}
-@@ -209,7 +209,7 @@ show_maps_json (char ** r, int * len, struct vectors * vecs)
- 		c = reply;
- 
- 		c += snprint_multipath_topology_json(c, maxlen, vecs);
--		again = ((c - reply) == maxlen);
-+		again = (c == reply + maxlen);
- 
- 		REALLOC_REPLY(reply, again, maxlen);
- 	}
-@@ -238,7 +238,7 @@ show_map_json (char ** r, int * len, struct multipath * mpp,
- 		c = reply;
- 
- 		c += snprint_multipath_map_json(c, maxlen, mpp);
--		again = ((c - reply) == maxlen);
-+		again = (c == reply + maxlen);
- 
- 		REALLOC_REPLY(reply, again, maxlen);
- 	}
-@@ -487,7 +487,7 @@ show_map (char ** r, int *len, struct multipath * mpp, char * style,
- 		c += snprint_multipath(c, reply + maxlen - c, style,
- 				       mpp, pretty);
- 
--		again = ((c - reply) == (maxlen - 1));
-+		again = (c == reply + maxlen - 1);
- 
- 		REALLOC_REPLY(reply, again, maxlen);
- 	}
-@@ -533,7 +533,7 @@ show_maps (char ** r, int *len, struct vectors * vecs, char * style,
- 		}
- 		c += snprint_foreign_multipaths(c, reply + maxlen - c,
- 						style, pretty);
--		again = ((c - reply) == (maxlen - 1));
-+		again = (c == reply + maxlen - 1);
- 
- 		REALLOC_REPLY(reply, again, maxlen);
- 	}
-@@ -1297,7 +1297,7 @@ show_blacklist (char ** r, int * len)
- 
- 		c = reply;
- 		c += snprint_blacklist_report(conf, c, maxlen);
--		again = ((c - reply) == maxlen);
-+		again = (c == reply + maxlen);
- 		REALLOC_REPLY(reply, again, maxlen);
- 	}
- 	pthread_cleanup_pop(1);
-@@ -1339,7 +1339,7 @@ show_devices (char ** r, int * len, struct vectors *vecs)
- 
- 		c = reply;
- 		c += snprint_devices(conf, c, maxlen, vecs);
--		again = ((c - reply) == maxlen);
-+		again = (c == reply + maxlen);
- 		REALLOC_REPLY(reply, again, maxlen);
- 	}
- 	pthread_cleanup_pop(1);
-diff --git a/multipathd/main.c b/multipathd/main.c
-index 8baf9abe..6b7db2c0 100644
---- a/multipathd/main.c
-+++ b/multipathd/main.c
-@@ -2374,7 +2374,7 @@ checkerloop (void *ap)
- 				conf = get_multipath_config();
- 				max_checkint = conf->max_checkint;
- 				put_multipath_config(conf);
--				if (diff_time.tv_sec > max_checkint)
-+				if (diff_time.tv_sec > (time_t)max_checkint)
- 					condlog(1, "path checkers took longer "
- 						"than %lu seconds, consider "
- 						"increasing max_polling_interval",
--- 
-2.17.2
-

SOURCES/0008-multipath-tools-make-EMC-Invista-config-work-with-al.patch

@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Xose Vazquez Perez <xose.vazquez@gmail.com>
+Date: Tue, 28 Sep 2021 19:31:21 +0200
+Subject: [PATCH] multipath-tools: make EMC/Invista config work with alua and
+ multibus
+
+Optimal Path Management (OPM) was introduced with VPLEX 5.5 to improve VPLEX
+performance. OPM uses the ALUA mechanism to spread the I/O load across VPLEX directors
+while gaining cache locality, pag #187:
+https://www.delltechnologies.com/en-us/collaterals/unauth/technical-guides-support-information/products/storage-2/docu5128.pdf
+
+Cc: Martin Wilck <mwilck@suse.com>
+Cc: Benjamin Marzinski <bmarzins@redhat.com>
+Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
+Cc: DM-DEVEL ML <dm-devel@redhat.com>
+Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
+Reviewed-by: Martin Wilck <mwilck@suse.com>
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ libmultipath/hwtable.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
+index 7095aaf1..4e8b52ff 100644
+--- a/libmultipath/hwtable.c
++++ b/libmultipath/hwtable.c
+@@ -350,8 +350,9 @@ static struct hwentry default_hw[] = {
+ 		.vendor        = "EMC",
+ 		.product       = "Invista",
+ 		.bl_product    = "LUNZ",
+-		.pgpolicy      = MULTIBUS,
++		.pgpolicy      = GROUP_BY_PRIO,
+ 		.no_path_retry = 5,
++		.pgfailback    = -FAILBACK_IMMEDIATE,
+ 	},
+ 	{
+ 		/* XtremIO */

SOURCES/0009-libmultipath-set_uint-fix-parsing-for-32bit.patch

@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martin Wilck <mwilck@suse.com>
-Date: Tue, 12 May 2020 00:39:27 +0200
-Subject: [PATCH] libmultipath: set_uint: fix parsing for 32bit
-
-On architectures where sizeof(long) == sizeof(int), the code wouldn't
-work as intended. Use strtoul instead. As strtoul happily parses
-negative numbers as input, require the number to begin with a digit.
-
-Signed-off-by: Martin Wilck <mwilck@suse.com>
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/dict.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/libmultipath/dict.c b/libmultipath/dict.c
-index 3e25e74f..0e9ea387 100644
---- a/libmultipath/dict.c
-+++ b/libmultipath/dict.c
-@@ -60,19 +60,22 @@ static int
- set_uint(vector strvec, void *ptr)
- {
- 	unsigned int *uint_ptr = (unsigned int *)ptr;
--	char *buff, *eptr;
--	long res;
-+	char *buff, *eptr, *p;
-+	unsigned long res;
- 	int rc;
- 
- 	buff = set_value(strvec);
- 	if (!buff)
- 		return 1;
- 
--	res = strtol(buff, &eptr, 10);
-+	p = buff;
-+	while (isspace(*p))
-+		p++;
-+	res = strtoul(p, &eptr, 10);
- 	if (eptr > buff)
- 		while (isspace(*eptr))
- 			eptr++;
--	if (*buff == '\0' || *eptr != '\0' || res < 0 || res > UINT_MAX) {
-+	if (*buff == '\0' || *eptr != '\0' || !isdigit(*p) || res > UINT_MAX) {
- 		condlog(1, "%s: invalid value for %s: \"%s\"",
- 			__func__, (char*)VECTOR_SLOT(strvec, 0), buff);
- 		rc = 1;
--- 
-2.17.2
-

SOURCES/0009-multipath-tools-make-COMPELNT-Compellent-Vol-config-.patch

@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Xose Vazquez Perez <xose.vazquez@gmail.com>
+Date: Tue, 28 Sep 2021 22:15:56 +0200
+Subject: [PATCH] multipath-tools: make "COMPELNT/Compellent Vol" config work
+ with alua and multibus
+
+ALUA is needed by SAS arrays, pag#124:
+https://downloads.dell.com/manuals/all-products/esuprt_solutions_int/esuprt_solutions_int_solutions_resources/general-solution-resources_white-papers2_en-us.pdf
+
+Cc: Sean McGinnis <sean_mcginnis@dell.com>
+Cc: Martin Wilck <mwilck@suse.com>
+Cc: Benjamin Marzinski <bmarzins@redhat.com>
+Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
+Cc: DM-DEVEL ML <dm-devel@redhat.com>
+Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
+Reviewed-by: Martin Wilck <mwilck@suse.com>
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ libmultipath/hwtable.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
+index 4e8b52ff..7fc5bc04 100644
+--- a/libmultipath/hwtable.c
++++ b/libmultipath/hwtable.c
+@@ -368,7 +368,8 @@ static struct hwentry default_hw[] = {
+ 		 */
+ 		.vendor        = "COMPELNT",
+ 		.product       = "Compellent Vol",
+-		.pgpolicy      = MULTIBUS,
++		.pgpolicy      = GROUP_BY_PRIO,
++		.pgfailback    = -FAILBACK_IMMEDIATE,
+ 		.no_path_retry = NO_PATH_RETRY_QUEUE,
+ 	},
+ 	{

SOURCES/0010-multipath-tools-Makefile-add-install-dependency.patch

@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martin Wilck <mwilck@suse.com>
-Date: Tue, 12 May 2020 22:38:22 +0200
-Subject: [PATCH] multipath-tools Makefile: add install dependency
-
-$(libdir) must exist before running "make install" on prioritizer, checker,
-and foreign libraries.
-
-Cc: Christian Hesse <mail@eworm.de>
-Signed-off-by: Martin Wilck <mwilck@suse.com>
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- Makefile | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index fec3b73b..8bcaba66 100644
---- a/Makefile
-+++ b/Makefile
-@@ -32,6 +32,10 @@ libmultipath libdmmp: libmpathcmd
- libmpathpersist multipath multipathd: libmultipath
- mpathpersist multipathd:  libmpathpersist
- 
-+libmultipath/checkers.install \
-+	libmultipath/prioritizers.install \
-+	libmultipath/foreign.install: libmultipath.install
-+
- $(BUILDDIRS.clean):
- 	$(MAKE) -C ${@:.clean=} clean
- 
--- 
-2.17.2
-

SOURCES/0010-multipath-tools-remove-Compellent-maintainer.patch

@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Xose Vazquez Perez <xose.vazquez@gmail.com>
+Date: Tue, 28 Sep 2021 22:39:17 +0200
+Subject: [PATCH] multipath-tools: remove Compellent maintainer
+
+e-mail was bounced: 550 5.1.1 User Unknown
+
+Cc: Martin Wilck <mwilck@suse.com>
+Cc: Benjamin Marzinski <bmarzins@redhat.com>
+Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
+Cc: DM-DEVEL ML <dm-devel@redhat.com>
+Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
+Reviewed-by: Martin Wilck <mwilck@suse.com>
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ libmultipath/hwtable.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
+index 7fc5bc04..763982cd 100644
+--- a/libmultipath/hwtable.c
++++ b/libmultipath/hwtable.c
+@@ -361,11 +361,7 @@ static struct hwentry default_hw[] = {
+ 		.pgpolicy      = MULTIBUS,
+ 	},
+ 	{
+-		/*
+-		 * SC Series, formerly Compellent
+-		 *
+-		 * Maintainer: Sean McGinnis <sean_mcginnis@dell.com>
+-		 */
++		/* SC Series, formerly Compellent */
+ 		.vendor        = "COMPELNT",
+ 		.product       = "Compellent Vol",
+ 		.pgpolicy      = GROUP_BY_PRIO,

SOURCES/0011-Revert-multipath-tools-make-EMC-Invista-config-work-.patch

@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martin Wilck <mwilck@suse.com>
+Date: Wed, 20 Oct 2021 20:44:54 +0200
+Subject: [PATCH] Revert "multipath-tools: make EMC/Invista config work with
+ alua and multibus"
+
+This reverts commit 309ff281aaa07e862540d3d645a8263f3e9baaed.
+
+Mail from <Wayne.Berthiaume@dell.com>, 20210930:
+
+"OPM is no longer supported in the Dell VPLEX product. If we at Dell had
+wished to change the default device stanzas for any of our products they
+would have been done when the product and/or feature is released.
+Please remove this patch as well. It is not needed."
+
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ libmultipath/hwtable.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
+index 763982cd..211087ad 100644
+--- a/libmultipath/hwtable.c
++++ b/libmultipath/hwtable.c
+@@ -350,9 +350,8 @@ static struct hwentry default_hw[] = {
+ 		.vendor        = "EMC",
+ 		.product       = "Invista",
+ 		.bl_product    = "LUNZ",
+-		.pgpolicy      = GROUP_BY_PRIO,
++		.pgpolicy      = MULTIBUS,
+ 		.no_path_retry = 5,
+-		.pgfailback    = -FAILBACK_IMMEDIATE,
+ 	},
+ 	{
+ 		/* XtremIO */

SOURCES/0012-Revert-multipath-tools-make-EMC-SYMMETRIX-config-wor.patch

@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martin Wilck <mwilck@suse.com>
+Date: Wed, 20 Oct 2021 20:46:09 +0200
+Subject: [PATCH] Revert "multipath-tools: make EMC/SYMMETRIX config work with
+ alua and multibus"
+
+This reverts commit 831af0dbfa171cd39d968ba6174669f11a278be9.
+
+Mail from "berthiaume, wayne" <Wayne.Berthiaume@dell.com>, 210930:
+
+"As a representative of Dell I request this patch be withdrawn. If we had
+wanted the default stanza changed we would have already implemented it.
+Also for your information we only advertise the entire enterprise storage
+product line (DMX, VMAX, VMAX AFA, PowerMax) as SYMMETRIX in the VPD page.
+The ALUA capability is only used for mobility devices in an SRDF/Metro
+configuration and the current device stanza still works well in all of our
+testing."
+
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ libmultipath/hwtable.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
+index 211087ad..a8ba28e3 100644
+--- a/libmultipath/hwtable.c
++++ b/libmultipath/hwtable.c
+@@ -329,9 +329,8 @@ static struct hwentry default_hw[] = {
+ 		/* Symmetrix / DMX / VMAX / PowerMax */
+ 		.vendor        = "EMC",
+ 		.product       = "SYMMETRIX",
+-		.pgpolicy      = GROUP_BY_PRIO,
++		.pgpolicy      = MULTIBUS,
+ 		.no_path_retry = 6,
+-		.pgfailback    = -FAILBACK_IMMEDIATE,
+ 	},
+ 	{
+ 		/* DGC CLARiiON CX/AX / VNX and Unity */

SOURCES/0013-RH-fixup-udev-rules-for-redhat.patch

@@ -15,10 +15,10 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile.inc b/Makefile.inc
-index 9060ac9b..034752d9 100644
+index d0ec9b44..2a75dc9c 100644
 --- a/Makefile.inc
 +++ b/Makefile.inc
-@@ -53,7 +53,7 @@ endif
+@@ -55,7 +55,7 @@ endif
  prefix		=
  exec_prefix	= $(prefix)
  usr_prefix	= $(prefix)
@@ -28,10 +28,10 @@ index 9060ac9b..034752d9 100644
  udevrulesdir	= $(libudevdir)/rules.d
  multipathdir	= $(TOPDIR)/libmultipath
 diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules
-index 8f990494..8a3a1718 100644
+index d7527d7d..0e0d70d5 100644
 --- a/kpartx/kpartx.rules
 +++ b/kpartx/kpartx.rules
-@@ -32,6 +32,6 @@ LABEL="mpath_kpartx_end"
+@@ -36,6 +36,6 @@ LABEL="mpath_kpartx_end"
  GOTO="kpartx_end"
  
  LABEL="run_kpartx"
@@ -61,6 +61,3 @@ index 0828a8f7..b9bbb3cf 100644
  	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
  	$(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
  
--- 
-2.17.2
-

SOURCES/0014-RH-Remove-the-property-blacklist-exception-builtin.patch

@@ -13,29 +13,26 @@ it.
 
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
- libmultipath/blacklist.c   |  9 ++-------
+ libmultipath/blacklist.c   |  6 ++----
  multipath/multipath.conf.5 | 11 ++++++-----
- tests/blacklist.c          |  6 ++----
+ tests/blacklist.c          |  7 ++-----
- 3 files changed, 10 insertions(+), 16 deletions(-)
+ 3 files changed, 10 insertions(+), 14 deletions(-)
 
 diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
-index 00e8dbdb..d9691b17 100644
+index 4e315c97..1e463ef6 100644
 --- a/libmultipath/blacklist.c
 +++ b/libmultipath/blacklist.c
-@@ -204,12 +204,6 @@ setup_default_blist (struct config * conf)
+@@ -202,9 +202,6 @@ setup_default_blist (struct config * conf)
- 	if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
+ 	if (store_ble(conf->blist_devnode, "!^(sd[a-z]|dasd[a-z]|nvme[0-9])", ORIGIN_DEFAULT))
  		return 1;
  
--	str = STRDUP("(SCSI_IDENT_|ID_WWN)");
+-	if (store_ble(conf->elist_property, "(SCSI_IDENT_|ID_WWN)", ORIGIN_DEFAULT))
--	if (!str)
--		return 1;
--	if (store_ble(conf->elist_property, str, ORIGIN_DEFAULT))
 -		return 1;
 -
  	vector_foreach_slot (conf->hwtable, hwe, i) {
  		if (hwe->bl_product) {
  			if (find_blacklist_device(conf->blist_device,
-@@ -411,7 +405,8 @@ filter_property(struct config *conf, struct udev_device *udev, int lvl,
+@@ -410,7 +407,8 @@ filter_property(const struct config *conf, struct udev_device *udev,
  			*uid_attribute != '\0';
  		bool uid_attr_seen = false;
  
@@ -46,10 +43,10 @@ index 00e8dbdb..d9691b17 100644
  				udev_device_get_properties_list_entry(udev)) {
  
 diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
-index 05a5e8ff..3455b1cc 100644
+index c74129bd..dd9f4dc7 100644
 --- a/multipath/multipath.conf.5
 +++ b/multipath/multipath.conf.5
-@@ -1286,9 +1286,14 @@ keywords. Both are regular expressions. For a full description of these keywords
+@@ -1351,9 +1351,14 @@ keywords. Both are regular expressions. For a full description of these keywords
  Regular expression for an udev property. All
  devices that have matching udev properties will be excluded/included.
  The handling of the \fIproperty\fR keyword is special,
@@ -65,7 +62,7 @@ index 05a5e8ff..3455b1cc 100644
  .
  .RS
  .PP
-@@ -1299,10 +1304,6 @@ Blacklisting by missing properties is only applied to devices which do have the
+@@ -1364,10 +1369,6 @@ Blacklisting by missing properties is only applied to devices which do have the
  property specified by \fIuid_attribute\fR (e.g. \fIID_SERIAL\fR)
  set. Previously, it was applied to every device, possibly causing devices to be
  blacklisted because of temporary I/O error conditions.
@@ -77,19 +74,21 @@ index 05a5e8ff..3455b1cc 100644
  .TP
  .B protocol
 diff --git a/tests/blacklist.c b/tests/blacklist.c
-index 6e7c1864..cc8a9a4a 100644
+index 882aa3a1..6a22b660 100644
 --- a/tests/blacklist.c
 +++ b/tests/blacklist.c
-@@ -271,7 +271,7 @@ static void test_property_missing(void **state)
+@@ -375,9 +375,8 @@ static void test_property_missing(void **state)
+ {
+ 	static struct udev_device udev = { "sdb", { "ID_FOO", "ID_BAZ", "ID_BAR", "ID_SERIAL", NULL } };
  	conf.blist_property = blist_property_wwn;
- 	expect_condlog(3, "sdb: blacklisted, udev property missing\n");
+-	expect_condlog(3, "sdb: blacklisted, udev property missing\n");
  	assert_int_equal(filter_property(&conf, &udev, 3, "ID_SERIAL"),
 -			 MATCH_PROPERTY_BLIST_MISSING);
 +			 MATCH_NOTHING);
  	assert_int_equal(filter_property(&conf, &udev, 3, "ID_BLAH"),
  			 MATCH_NOTHING);
  	assert_int_equal(filter_property(&conf, &udev, 3, ""),
-@@ -363,9 +363,7 @@ static void test_filter_path_missing1(void **state)
+@@ -469,9 +468,7 @@ static void test_filter_path_missing1(void **state)
  	conf.blist_device = blist_device_foo_bar;
  	conf.blist_protocol = blist_protocol_fcp;
  	conf.blist_wwid = blist_wwid_xyzzy;
@@ -100,6 +99,3 @@ index 6e7c1864..cc8a9a4a 100644
  }
  
  /* This one matches the property whitelist, to test the other missing
--- 
-2.17.2
-

SOURCES/0014-RH-use-rpm-optflags-if-present.patch

@@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Wed, 19 Apr 2017 06:10:01 -0500
-Subject: [PATCH] RH: use rpm optflags if present
-
-Use the passed in optflags when compiling as an RPM, and keep the
-default flags as close as possible to the current fedora flags, while
-still being generic.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- Makefile.inc | 29 +++++++++++++++++++++--------
- 1 file changed, 21 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.inc b/Makefile.inc
-index 034752d9..c2abd301 100644
---- a/Makefile.inc
-+++ b/Makefile.inc
-@@ -89,16 +89,29 @@ TEST_CC_OPTION = $(shell \
- 		echo "$(2)"; \
- 	fi)
- 
--STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector)
- ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers,)
- WNOCLOBBERED := $(call TEST_CC_OPTION,-Wno-clobbered -Wno-error=clobbered,)
-+ifndef RPM_OPT_FLAGS
-+	STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector)
-+	OPTFLAGS	= -O2 -g -pipe -Wall -Werror=format-security \
-+			  -Wp,-D_FORTIFY_SOURCE=2 -fexceptions \
-+			  $(STACKPROT) -grecord-gcc-switches \
-+			  -fasynchronous-unwind-tables
-+	ifeq ($(shell test -f /usr/lib/rpm/redhat/redhat-hardened-cc1 && echo 1),1)
-+		OPTFLAGS += -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1
-+	endif
-+	ifeq ($(shell test -f /usr/lib/rpm/redhat/redhat-annobin-cc1 && echo 1),1)
-+		OPTFLAGS += -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1
-+	endif
-+else
-+	OPTFLAGS = $(RPM_OPT_FLAGS)
-+endif
-+OPTFLAGS	+= -Werror -Wextra -Wstrict-prototypes -Wformat=2 \
-+		   -Werror=implicit-int -Werror=implicit-function-declaration \
-+		   $(WNOCLOBBERED) \
-+		   -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \
-+		   --param=ssp-buffer-size=4
- 
--OPTFLAGS	= -O2 -g -pipe -Werror -Wall -Wextra -Wformat=2 -Werror=implicit-int \
--		  -Werror=implicit-function-declaration -Werror=format-security \
--		  $(WNOCLOBBERED) \
--		  -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \
--		  $(STACKPROT) --param=ssp-buffer-size=4
--CPPFLAGS	:= -Wp,-D_FORTIFY_SOURCE=2 
- CFLAGS		:= $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
- 		   -MMD -MP $(CFLAGS)
- BIN_CFLAGS	= -fPIE -DPIE
-@@ -135,4 +148,4 @@ check_file = $(shell \
- 
- %.o:	%.c
- 	@echo building $@ because of $?
--	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) -c -o $@ $<
--- 
-2.17.2
-

SOURCES/0015-RH-don-t-start-without-a-config-file.patch

@@ -12,26 +12,19 @@ simple way to disable multipath.  Simply removing or renaming
 
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
- libmultipath/config.c         | 15 +++++++++++++++
+ libmultipath/config.c         | 13 +++++++++++++
  libmultipath/config.h         |  1 +
  multipath/multipath.rules     |  1 +
  multipathd/multipathd.8       |  2 ++
  multipathd/multipathd.service |  1 +
- 5 files changed, 20 insertions(+)
+ multipathd/multipathd.socket  |  1 +
+ 6 files changed, 19 insertions(+)
 
 diff --git a/libmultipath/config.c b/libmultipath/config.c
-index b4d87689..b36778b0 100644
+index 30046a17..5f35c3d3 100644
 --- a/libmultipath/config.c
 +++ b/libmultipath/config.c
-@@ -26,6 +26,7 @@
+@@ -895,6 +895,19 @@ int _init_config (const char *file, struct config *conf)
- #include "devmapper.h"
- #include "mpath_cmd.h"
- #include "propsel.h"
-+#include "version.h"
- 
- static int
- hwe_strmatch (const struct hwentry *hwe1, const struct hwentry *hwe2)
-@@ -778,6 +779,20 @@ load_config (char * file)
  			goto out;
  		}
  		factorize_hwtable(conf->hwtable, builtin_hwtable_size, file);
@@ -44,8 +37,7 @@ index b4d87689..b36778b0 100644
 +				goto out;
 +			}
 +		}
-+		if (store_ble(conf->blist_devnode, strdup(".*"),
++		if (store_ble(conf->blist_devnode, ".*", ORIGIN_NO_CONFIG)) {
-+		              ORIGIN_NO_CONFIG)) {
 +			condlog(0, "cannot store default no-config blacklist\n");
 +			goto out;
 +		}
@@ -53,7 +45,7 @@ index b4d87689..b36778b0 100644
  
  	conf->processed_main_config = 1;
 diff --git a/libmultipath/config.h b/libmultipath/config.h
-index ceecff2d..3368d8c9 100644
+index 933fe0d1..5f01c1fc 100644
 --- a/libmultipath/config.h
 +++ b/libmultipath/config.h
 @@ -9,6 +9,7 @@
@@ -62,8 +54,8 @@ index ceecff2d..3368d8c9 100644
  #define ORIGIN_CONFIG  1
 +#define ORIGIN_NO_CONFIG 2
  
- /*
+ enum devtypes {
-  * In kernel, fast_io_fail == 0 means immediate failure on rport delete.
+ 	DEV_NONE,
 diff --git a/multipath/multipath.rules b/multipath/multipath.rules
 index 9df11a95..0486bf70 100644
 --- a/multipath/multipath.rules
@@ -90,17 +82,26 @@ index 048a838d..8bd47a80 100644
  .
  .\" ----------------------------------------------------------------------------
 diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service
-index ba24983e..17434cef 100644
+index 0b2ac814..6d57c7e8 100644
 --- a/multipathd/multipathd.service
 +++ b/multipathd/multipathd.service
 @@ -4,6 +4,7 @@ Wants=systemd-udev-trigger.service systemd-udev-settle.service
  Before=iscsi.service iscsid.service lvm2-activation-early.service
- Before=local-fs-pre.target blk-availability.service
+ Before=local-fs-pre.target blk-availability.service shutdown.target
  After=multipathd.socket systemd-udev-trigger.service systemd-udev-settle.service
 +ConditionPathExists=/etc/multipath.conf
  DefaultDependencies=no
  Conflicts=shutdown.target
  ConditionKernelCommandLine=!nompath
--- 
+diff --git a/multipathd/multipathd.socket b/multipathd/multipathd.socket
-2.17.2
+index c777e5e3..3c20a2ff 100644
-
+--- a/multipathd/multipathd.socket
++++ b/multipathd/multipathd.socket
+@@ -1,6 +1,7 @@
+ [Unit]
+ Description=multipathd control socket
+ DefaultDependencies=no
++ConditionPathExists=/etc/multipath.conf
+ ConditionKernelCommandLine=!nompath
+ ConditionKernelCommandLine=!multipath=off
+ ConditionVirtualization=!container

SOURCES/0016-RH-Fix-nvme-function-missing-argument.patch

@@ -1,7 +1,10 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Fri, 25 Jan 2019 14:54:56 -0600
-Subject: [PATCH] RH: Fix nvme compilation warning
+Subject: [PATCH] RH: Fix nvme function missing argument
+
+A future patch will change the compilation options to error when
+function declarations have unspecified arguments.
 
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
@@ -21,6 +24,3 @@ index adb192b6..bfd10ef8 100644
  void argconfig_append_usage(const char *str);
  void argconfig_print_help(const char *program_desc,
  			  const struct argconfig_commandline_options *options);
--- 
-2.17.2
-

SOURCES/0017-RH-use-rpm-optflags-if-present.patch

@@ -0,0 +1,66 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Benjamin Marzinski <bmarzins@redhat.com>
+Date: Wed, 19 Apr 2017 06:10:01 -0500
+Subject: [PATCH] RH: use rpm optflags if present
+
+Use the passed in optflags when compiling as an RPM, and keep the
+default flags as close as possible to the current fedora flags, while
+still being generic.
+
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ Makefile.inc | 26 +++++++++++++++++++-------
+ 1 file changed, 19 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.inc b/Makefile.inc
+index 2a75dc9c..5ac660de 100644
+--- a/Makefile.inc
++++ b/Makefile.inc
+@@ -92,23 +92,35 @@ TEST_CC_OPTION = $(shell \
+ 		echo "$(2)"; \
+ 	fi)
+ 
+-STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector)
+ ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers,)
+ WNOCLOBBERED := $(call TEST_CC_OPTION,-Wno-clobbered -Wno-error=clobbered,)
+ WFORMATOVERFLOW := $(call TEST_CC_OPTION,-Wformat-overflow=2,)
+ 
+-OPTFLAGS	:= -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
+-WARNFLAGS	:= -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
++ifndef RPM_OPT_FLAGS
++	STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector)
++	OPTFLAGS := -O2 -g -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions \
++		    $(STACKPROT) -grecord-gcc-switches \
++		    -fasynchronous-unwind-tables --param=ssp-buffer-size=4
++	ifeq ($(shell test -f /usr/lib/rpm/redhat/redhat-hardened-cc1 && echo 1),1)
++		OPTFLAGS += -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1
++	endif
++	ifeq ($(shell test -f /usr/lib/rpm/redhat/redhat-annobin-cc1 && echo 1),1)
++		OPTFLAGS += -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1
++	endif
++else
++	OPTFLAGS := $(RPM_OPT_FLAGS) --param=ssp-buffer-size=4
++endif
++WARNFLAGS	:= -Werror -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
+ 		  -Werror=implicit-function-declaration -Werror=format-security \
+-		  $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS)
+-CPPFLAGS	:= -Wp,-D_FORTIFY_SOURCE=2
++		  $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \
++		  -Wstrict-prototypes
+ CFLAGS		:= --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \
+ 		   -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
+ 		   -MMD -MP
+ BIN_CFLAGS	= -fPIE -DPIE
+ LIB_CFLAGS	= -fPIC
+ SHARED_FLAGS	= -shared
+-LDFLAGS		:= $(LDFLAGS) -Wl,-z,relro -Wl,-z,now -Wl,-z,defs
++LDFLAGS		:= $(LDFLAGS) $(RPM_LD_FLAGS) -Wl,-z,relro -Wl,-z,now -Wl,-z,defs
+ BIN_LDFLAGS	= -pie
+ 
+ # Check whether a function with name $1 has been declared in header file $2.
+@@ -139,4 +151,4 @@ check_file = $(shell \
+ 
+ %.o:	%.c
+ 	@echo building $@ because of $?
+-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<

SOURCES/0017-RH-warn-on-invalid-regex-instead-of-failing.patch

@@ -1,121 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Mon, 6 Nov 2017 21:39:28 -0600
-Subject: [PATCH] RH: warn on invalid regex instead of failing
-
-multipath.conf used to allow "*" as a match everything regular expression,
-instead of requiring ".*". Instead of erroring when the old style
-regular expressions are used, it should print a warning and convert
-them.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/dict.c   | 27 +++++++++++++++++++++------
- libmultipath/parser.c | 13 +++++++++++++
- libmultipath/parser.h |  1 +
- 3 files changed, 35 insertions(+), 6 deletions(-)
-
-diff --git a/libmultipath/dict.c b/libmultipath/dict.c
-index 0e9ea387..184d4b22 100644
---- a/libmultipath/dict.c
-+++ b/libmultipath/dict.c
-@@ -103,6 +103,21 @@ set_str(vector strvec, void *ptr)
- 	return 0;
- }
- 
-+static int
-+set_regex(vector strvec, void *ptr)
-+{
-+	char **str_ptr = (char **)ptr;
-+
-+	if (*str_ptr)
-+		FREE(*str_ptr);
-+	*str_ptr = set_regex_value(strvec);
-+
-+	if (!*str_ptr)
-+		return 1;
-+
-+	return 0;
-+}
-+
- static int
- set_yes_no(vector strvec, void *ptr)
- {
-@@ -1504,7 +1519,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec)		\
- 	if (!conf->option)						\
- 		return 1;						\
- 									\
--	buff = set_value(strvec);					\
-+	buff = set_regex_value(strvec);					\
- 	if (!buff)							\
- 		return 1;						\
- 									\
-@@ -1520,7 +1535,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec) \
- 	if (!conf->option)						\
- 		return 1;						\
- 									\
--	buff = set_value(strvec);					\
-+	buff = set_regex_value(strvec);					\
- 	if (!buff)							\
- 		return 1;						\
- 									\
-@@ -1623,16 +1638,16 @@ device_handler(struct config *conf, vector strvec)
- 	return 0;
- }
- 
--declare_hw_handler(vendor, set_str)
-+declare_hw_handler(vendor, set_regex)
- declare_hw_snprint(vendor, print_str)
- 
--declare_hw_handler(product, set_str)
-+declare_hw_handler(product, set_regex)
- declare_hw_snprint(product, print_str)
- 
--declare_hw_handler(revision, set_str)
-+declare_hw_handler(revision, set_regex)
- declare_hw_snprint(revision, print_str)
- 
--declare_hw_handler(bl_product, set_str)
-+declare_hw_handler(bl_product, set_regex)
- declare_hw_snprint(bl_product, print_str)
- 
- declare_hw_handler(hwhandler, set_str)
-diff --git a/libmultipath/parser.c b/libmultipath/parser.c
-index d478b177..a184511b 100644
---- a/libmultipath/parser.c
-+++ b/libmultipath/parser.c
-@@ -382,6 +382,19 @@ oom:
- 	return NULL;
- }
- 
-+void *
-+set_regex_value(vector strvec)
-+{
-+	char *buff = set_value(strvec);
-+
-+	if (buff && strcmp("*", buff) == 0) {
-+		condlog(0, "Invalid regular expression \"*\" in multipath.conf. Using \".*\"");
-+		FREE(buff);
-+		return strdup(".*");
-+	}
-+	return buff;
-+}
-+
- /* non-recursive configuration stream handler */
- static int kw_level = 0;
- 
-diff --git a/libmultipath/parser.h b/libmultipath/parser.h
-index 62906e98..b7917052 100644
---- a/libmultipath/parser.h
-+++ b/libmultipath/parser.h
-@@ -77,6 +77,7 @@ extern void dump_keywords(vector keydump, int level);
- extern void free_keywords(vector keywords);
- extern vector alloc_strvec(char *string);
- extern void *set_value(vector strvec);
-+extern void *set_regex_value(vector strvec);
- extern int process_file(struct config *conf, char *conf_file);
- extern struct keyword * find_keyword(vector keywords, vector v, char * name);
- int snprint_keyword(char *buff, int len, char *fmt, struct keyword *kw,
--- 
-2.17.2
-

SOURCES/0018-RH-add-mpathconf.patch

@@ -14,17 +14,17 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
  libmultipath/config.c |   2 +
  multipath/Makefile    |   5 +
- multipath/mpathconf   | 555 ++++++++++++++++++++++++++++++++++++++++++
+ multipath/mpathconf   | 556 ++++++++++++++++++++++++++++++++++++++++++
  multipath/mpathconf.8 | 135 ++++++++++
- 4 files changed, 697 insertions(+)
+ 4 files changed, 698 insertions(+)
  create mode 100644 multipath/mpathconf
  create mode 100644 multipath/mpathconf.8
 
 diff --git a/libmultipath/config.c b/libmultipath/config.c
-index b36778b0..26f8e050 100644
+index 5f35c3d3..cee3bbb7 100644
 --- a/libmultipath/config.c
 +++ b/libmultipath/config.c
-@@ -781,6 +781,8 @@ load_config (char * file)
+@@ -897,6 +897,8 @@ int _init_config (const char *file, struct config *conf)
  		factorize_hwtable(conf->hwtable, builtin_hwtable_size, file);
  	} else {
  		condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices.");
@@ -69,10 +69,10 @@ index b9bbb3cf..e720c7f6 100644
  	$(RM) core *.o $(EXEC) *.gz
 diff --git a/multipath/mpathconf b/multipath/mpathconf
 new file mode 100644
-index 00000000..f34003c9
+index 00000000..c00d2555
 --- /dev/null
 +++ b/multipath/mpathconf
-@@ -0,0 +1,555 @@
+@@ -0,0 +1,556 @@
 +#!/bin/bash
 +#
 +# Copyright (C) 2010 Red Hat, Inc. All rights reserved.
@@ -107,11 +107,6 @@ index 00000000..f34003c9
 +defaults {
 +	user_friendly_names yes
 +	find_multipaths yes
-+	enable_foreign \"^$\"
-+}
-+
-+blacklist_exceptions {
-+        property \"(SCSI_IDENT_|ID_WWN)\"
 +}"
 +
 +CONFIGFILE="/etc/multipath.conf"
@@ -129,8 +124,8 @@ index 00000000..f34003c9
 +	echo "Disable: --disable"
 +	echo "Only allow certain wwids (instead of enable): --allow <WWID>"
 +	echo "Set user_friendly_names (Default y): --user_friendly_names <y|n>"
-+	echo "Set find_multipaths (Default y): --find_multipaths <y|n>"
++	echo "Set find_multipaths (Default y): --find_multipaths <yes|no|strict|greedy|smart>"
-+	echo "Set default property blacklist (Default y): --property_blacklist <y|n>"
++	echo "Set default property blacklist (Default n): --property_blacklist <y|n>"
 +	echo "Set enable_foreign to show foreign devices (Default n): --enable_foreign <y|n>"
 +	echo "Load the dm-multipath modules on enable (Default y): --with_module <y|n>"
 +	echo "start/stop/reload multipathd (Default n): --with_multipathd <y|n>"
@@ -299,8 +294,12 @@ index 00000000..f34003c9
 +		echo "--user_friendly_names must be either 'y' or 'n'"
 +		exit 1
 +	fi
-+	if [ -n "$FIND" ] && [ "$FIND" != "y" -a "$FIND" != "n" ]; then
++	if [ "$FIND" = "y" ]; then
-+		echo "--find_multipaths must be either 'y' or 'n'"
++		FIND="yes"
++	elif [ "$FIND" = "n" ]; then
++		FIND="no"
++	elif [ -n "$FIND" ] && [ "$FIND" != "yes" -a "$FIND" != "no" -a "$FIND" != "strict" -a "$FIND" != "greedy" -a "$FIND" != "smart" ]; then
++		echo "--find_multipaths must be one of 'yes' 'no' 'strict' 'greedy' or 'smart'"
 +		exit 1
 +	fi
 +	if [ -n "$PROPERTY" ] && [ "$PROPERTY" != "y" -a "$PROPERTY" != "n" ]; then
@@ -311,7 +310,7 @@ index 00000000..f34003c9
 +		echo "--enable_foreign must be either 'y' or 'n'"
 +		exit 1
 +	fi
-+	if [ -z "$ENABLE" -a -z "$FIND" -a -z "$FRIENDLY" -a -z "$PROPERTY" ]; then
++	if [ -z "$ENABLE" -a -z "$FIND" -a -z "$FRIENDLY" -a -z "$PROPERTY" -a -z "$FOREIGN" ]; then
 +		SHOW_STATUS=1
 +	fi
 +	if [ -n "$MODULE" ] && [ "$MODULE" != "y" -a "$MODULE" != "n" ]; then
@@ -386,45 +385,50 @@ index 00000000..f34003c9
 +fi
 +
 +if [ "$HAVE_BLACKLIST" = "1" ]; then
-+	if sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*devnode \"\.\?\*\"" ; then
++	if sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*devnode[[:space:]][[:space:]]*\"\.\?\*\"" ; then
 +		HAVE_DISABLE=1
-+	elif sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*#[[:space:]]*devnode \"\.\?\*\"" ; then
++	elif sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*#[[:space:]]*devnode[[:space:]][[:space:]]*\"\.\?\*\"" ; then
 +		HAVE_DISABLE=0
 +	fi
 +fi
 +
 +if [ "$HAVE_BLACKLIST" = "1" ]; then
-+	if sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*wwid \"\.\?\*\"" ; then
++	if sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*wwid[[:space:]][[:space:]]*\"\.\?\*\"" ; then
 +		HAVE_WWID_DISABLE=1
-+	elif sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*#[[:space:]]*wwid \"\.\?\*\"" ; then
++	elif sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*#[[:space:]]*wwid[[:space:]][[:space:]]*\"\.\?\*\"" ; then
 +		HAVE_WWID_DISABLE=0
 +	fi
 +fi
 +
 +if [ "$HAVE_DEFAULTS" = "1" ]; then
-+	if sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*find_multipaths[[:space:]]*\(yes\|1\)" ; then
++	HAVE_FIND=`sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | sed -n 's/^[[:blank:]]*find_multipaths[[:blank:]][[:blank:]]*\([^[:blank:]]*\).*$/\1/p' | sed -n 1p`
-+		HAVE_FIND=1
++	if [ "$HAVE_FIND" = "1" ]; then
-+	elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*find_multipaths[[:space:]]*\(no\|0\)" ; then
++		HAVE_FIND="yes"
-+		HAVE_FIND=0
++	elif [ "$HAVE_FIND" = "0" ]; then
++		HAVE_FIND="no"
 +	fi
-+	if sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*user_friendly_names[[:space:]]*\(yes\|1\)" ; then
++	if sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*user_friendly_names[[:space:]][[:space:]]*\(yes\|1\)" ; then
 +		HAVE_FRIENDLY=1
-+	elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*user_friendly_names[[:space:]]*\(no\|0\)" ; then
++	elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*user_friendly_names[[:space:]][[:space:]]*\(no\|0\)" ; then
 +		HAVE_FRIENDLY=0
 +	fi
 +	if sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*#[[:space:]]*enable_foreign" ; then
 +		HAVE_FOREIGN=0
-+	elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*enable_foreign[[:space:]]*\"\^\$\"" ; then
++	elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*enable_foreign[[:space:]][[:space:]]*\"\.\*\"" ; then
 +		HAVE_FOREIGN=1
-+	elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*enable_foreign" ; then
++	elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*enable_foreign[[:space:]][[:space:]]*\"\^\$\"" ; then
 +		HAVE_FOREIGN=2
++	elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*enable_foreign[[:space:]][[:space:]]*\"NONE\"" ; then
++		HAVE_FOREIGN=2
++	elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*enable_foreign" ; then
++		HAVE_FOREIGN=3
 +	fi
 +fi
 +
 +if [ "$HAVE_EXCEPTIONS" = "1" ]; then
-+	if sed -n '/^blacklist_exceptions[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*property[[:space:]]*\"(SCSI_IDENT_|ID_WWN)\"" ; then
++	if sed -n '/^blacklist_exceptions[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*property[[:space:]][[:space:]]*\"(SCSI_IDENT_|ID_WWN)\"" ; then
 +                HAVE_PROPERTY=1
-+        elif sed -n '/^blacklist_exceptions[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*#[[:space:]]*property[[:space:]]*\"(SCSI_IDENT_|ID_WWN)\"" ; then
++        elif sed -n '/^blacklist_exceptions[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*#[[:space:]]*property[[:space:]][[:space:]]*\"(SCSI_IDENT_|ID_WWN)\"" ; then
 +                HAVE_PROPERTY=0
 +        fi
 +fi
@@ -435,10 +439,10 @@ index 00000000..f34003c9
 +	else
 +		echo "multipath is disabled"
 +	fi
-+	if [ -z "$HAVE_FIND"  -o "$HAVE_FIND" = 0 ]; then
++	if [ -z "$HAVE_FIND" ]; then
-+		echo "find_multipaths is disabled"
++		echo "find_multipaths is no"
 +	else
-+		echo "find_multipaths is enabled"
++		echo "find_multipaths is $HAVE_FIND"
 +	fi
 +	if [ -z "$HAVE_FRIENDLY" -o "$HAVE_FRIENDLY" = 0 ]; then
 +		echo "user_friendly_names is disabled"
@@ -451,8 +455,10 @@ index 00000000..f34003c9
 +		echo "default property blacklist is enabled"
 +	fi
 +	if [ -z "$HAVE_FOREIGN" -o "$HAVE_FOREIGN" = 0 ]; then
-+		echo "enable_foreign is not set (all foreign multipath devices will be shown)"
++		echo "enable_foreign is not set (no foreign multipath devices will be shown)"
 +	elif [ "$HAVE_FOREIGN" = 1 ]; then
++		echo "enable_foreign is set (all foreign multipath devices will be shown)"
++	elif [ "$HAVE_FOREIGN" = 2 ]; then
 +		echo "enable_foreign is set (no foreign multipath devices will be shown)"
 +	else
 +		echo "enable_foreign is set (foreign multipath devices may not be shown)"
@@ -497,14 +503,14 @@ index 00000000..f34003c9
 +
 +if [ "$ENABLE" = 2 ]; then
 +	if [ "$HAVE_DISABLE" = 1 ]; then
-+		sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*devnode \"\.\?\*\"/#	devnode ".*"/' $TMPFILE
++		sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*devnode[[:space:]][[:space:]]*\"\.\?\*\"/#	devnode ".*"/' $TMPFILE
 +	fi
 +	if [ -z "$HAVE_WWID_DISABLE" ]; then
 +		sed -i '/^blacklist[[:space:]]*{/ a\
 +	wwid ".*"
 +' $TMPFILE
 +	elif [ "$HAVE_WWID_DISABLE" = 0 ]; then
-+		sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*#[[:space:]]*wwid \"\.\?\*\"/	wwid ".*"/' $TMPFILE
++		sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*#[[:space:]]*wwid[[:space:]][[:space:]]*\"\.\?\*\"/	wwid ".*"/' $TMPFILE
 +	fi
 +	if [ "$HAVE_EXCEPTIONS" = 1 ]; then
 +		sed -i '/^blacklist_exceptions[[:space:]]*{/,/^}/ {/^[[:space:]]*wwid/ d}' $TMPFILE
@@ -518,7 +524,7 @@ index 00000000..f34003c9
 +	add_blacklist_exceptions
 +elif [ "$ENABLE" = 1 ]; then
 +	if [ "$HAVE_DISABLE" = 1 ]; then
-+		sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*devnode \"\.\?\*\"/#	devnode ".*"/' $TMPFILE
++		sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*devnode[[:space:]][[:space:]]*\"\.\?\*\"/#	devnode ".*"/' $TMPFILE
 +	fi
 +elif [ "$ENABLE" = 0 ]; then
 +	if [ -z "$HAVE_DISABLE" ]; then
@@ -526,30 +532,25 @@ index 00000000..f34003c9
 +	devnode ".*"
 +' $TMPFILE
 +	elif [ "$HAVE_DISABLE" = 0 ]; then
-+		sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*#[[:space:]]*devnode \"\.\?\*\"/	devnode ".*"/' $TMPFILE
++		sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*#[[:space:]]*devnode[[:space:]][[:space:]]*\"\.\?\*\"/	devnode ".*"/' $TMPFILE
 +	fi
 +fi
 +
-+if [ "$FIND" = "n" ]; then
++if [ -n "$FIND" ]; then
-+	if [ "$HAVE_FIND" = 1 ]; then
-+		sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*find_multipaths[[:space:]]*\(yes\|1\)/	find_multipaths no/' $TMPFILE
-+		CHANGED_CONFIG=1
-+	fi
-+elif [ "$FIND" = "y" ]; then
 +	if [ -z "$HAVE_FIND" ]; then
 +		sed -i '/^defaults[[:space:]]*{/ a\
-+	find_multipaths yes
++	find_multipaths '"$FIND"'
 +' $TMPFILE
 +		CHANGED_CONFIG=1
-+	elif [ "$HAVE_FIND" = 0 ]; then
++	elif [ "$FIND" != "$HAVE_FIND" ]; then
-+		sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*find_multipaths[[:space:]]*\(no\|0\)/	find_multipaths yes/' $TMPFILE
++		sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:blank:]]*find_multipaths[[:blank:]][[:blank:]]*[^[:blank:]]*/	find_multipaths '"$FIND"'/' $TMPFILE
 +		CHANGED_CONFIG=1
 +	fi
 +fi
 +
 +if [ "$FRIENDLY" = "n" ]; then
 +	if [ "$HAVE_FRIENDLY" = 1 ]; then
-+		sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*user_friendly_names[[:space:]]*\(yes\|1\)/	user_friendly_names no/' $TMPFILE
++		sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*user_friendly_names[[:space:]][[:space:]]*\(yes\|1\)/	user_friendly_names no/' $TMPFILE
 +		CHANGED_CONFIG=1
 +	fi
 +elif [ "$FRIENDLY" = "y" ]; then
@@ -559,14 +560,14 @@ index 00000000..f34003c9
 +' $TMPFILE
 +		CHANGED_CONFIG=1
 +	elif [ "$HAVE_FRIENDLY" = 0 ]; then
-+		sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*user_friendly_names[[:space:]]*\(no\|0\)/	user_friendly_names yes/' $TMPFILE
++		sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*user_friendly_names[[:space:]][[:space:]]*\(no\|0\)/	user_friendly_names yes/' $TMPFILE
 +		CHANGED_CONFIG=1
 +	fi
 +fi
 +
 +if [ "$PROPERTY" = "n" ]; then
 +	if [ "$HAVE_PROPERTY" = 1 ]; then
-+		sed -i '/^blacklist_exceptions[[:space:]]*{/,/^}/ s/^[[:space:]]*property[[:space:]]*\"(SCSI_IDENT_|ID_WWN)\"/#	property \"(SCSI_IDENT_|ID_WWN)\"/' $TMPFILE
++		sed -i '/^blacklist_exceptions[[:space:]]*{/,/^}/ s/^[[:space:]]*property[[:space:]][[:space:]]*\"(SCSI_IDENT_|ID_WWN)\"/#	property \"(SCSI_IDENT_|ID_WWN)\"/' $TMPFILE
 +		CHANGED_CONFIG=1
 +	fi
 +elif [ "$PROPERTY" = "y" ]; then
@@ -576,24 +577,24 @@ index 00000000..f34003c9
 +' $TMPFILE
 +		CHANGED_CONFIG=1
 +	elif [ "$HAVE_PROPERTY" = 0 ]; then
-+		sed -i '/^blacklist_exceptions[[:space:]]*{/,/^}/ s/^[[:space:]]*#[[:space:]]*property[[:space:]]*\"(SCSI_IDENT_|ID_WWN)\"/	property \"(SCSI_IDENT_|ID_WWN)\"/' $TMPFILE
++		sed -i '/^blacklist_exceptions[[:space:]]*{/,/^}/ s/^[[:space:]]*#[[:space:]]*property[[:space:]][[:space:]]*\"(SCSI_IDENT_|ID_WWN)\"/	property \"(SCSI_IDENT_|ID_WWN)\"/' $TMPFILE
 +		CHANGED_CONFIG=1
 +	fi
 +fi
 +
-+if [ "$FOREIGN" = "y" ]; then
++if [ "$FOREIGN" = "n" ]; then
-+	if [ "$HAVE_FOREIGN" = 1 -o "$HAVE_FOREIGN" = 2 ]; then
++	if [ "$HAVE_FOREIGN" = 1 -o "$HAVE_FOREIGN" = 3 ]; then
 +		sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*enable_foreign/#	enable_foreign/' $TMPFILE
 +		CHANGED_CONFIG=1
 +	fi
-+elif [ "$FOREIGN" = "n" ]; then
++elif [ "$FOREIGN" = "y" ]; then
 +	if [ -z "$HAVE_FOREIGN" ]; then
 +		sed -i '/^defaults[[:space:]]*{/ a\
-+	enable_foreign "^$"
++	enable_foreign ".*"
 +' $TMPFILE
 +		CHANGED_CONFIG=1
-+	elif [ "$HAVE_FOREIGN" = 0 -o "$HAVE_FOREIGN" = 2 ]; then
++	elif [ "$HAVE_FOREIGN" = 0 -o "$HAVE_FOREIGN" = 2 -o "$HAVE_FOREIGN" = 3 ]; then
-+		sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*#\?[[:space:]]*enable_foreign.*$/	enable_foreign "^$"/' $TMPFILE
++		sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*#\?[[:space:]]*enable_foreign.*$/	enable_foreign ".*"/' $TMPFILE
 +		CHANGED_CONFIG=1
 +	fi
 +fi
@@ -630,7 +631,7 @@ index 00000000..f34003c9
 +fi
 diff --git a/multipath/mpathconf.8 b/multipath/mpathconf.8
 new file mode 100644
-index 00000000..b82961d6
+index 00000000..a14d831e
 --- /dev/null
 +++ b/multipath/mpathconf.8
 @@ -0,0 +1,135 @@
@@ -674,9 +675,9 @@ index 00000000..b82961d6
 +already exists, mpathconf will edit it. If it does not exist, mpathconf will
 +create a default file with
 +.B user_friendly_names
-+and
++set and
 +.B find_multipaths
-+set. To disable these, use the
++set to \fByes\fP. To disable these, use the
 +.B --user_friendly_names n
 +and
 +.B --find_multipaths n
@@ -713,13 +714,13 @@ index 00000000..b82961d6
 +defaults section. If set to \fBn\fP, this removes the line, if present. This
 +command can be used along with any other command.
 +.TP
-+.B --find_multipaths\fP { \fBy\fP | \fBn\fP }
++.B --find_multipaths\fP { \fByes\fP | \fBno\fP | \fBstrict\fP | \fBgreedy\fP | \fBsmart\fP }
-+If set to \fBy\fP, this adds the line
++If set to \fB<value>\fP, this adds the line
-+.B find_multipaths yes
++.B find_multipaths <value>
 +to the
 +.B /etc/multipath.conf
-+defaults section. If set to \fBn\fP, this removes the line, if present. This
++defaults section. This command can be used along with any other command.
-+command can be used along with any other command.
++\fBy\fP and \fBn\fP can be used instead of \fByes\fP and \fBno\fP.
 +.TP
 +.B --property_blacklist \fP { \fBy\fP | \fBn\fP }
 +If set to \fBy\fP, this adds the line
@@ -730,11 +731,11 @@ index 00000000..b82961d6
 +present. This command can be used along with any other command.
 +.TP
 +.B --enable_foreign\fP { \fBy\fP | \fBn\fP }
-+If set to \fBn\fP, this adds the line
++If set to \fBy\fP, this adds the line
-+.B enable_foreign "^$"
++.B enable_foreign ".*"
 +to the
 +.B /etc/multipath.conf
-+defaults section. if set to \fBy\fP, this removes the line, if present. This
++defaults section. if set to \fBn\fP, this removes the line, if present. This
 +command can be used along with any other command.
 +.TP
 +.B --outfile \fB<filename>\fP
@@ -769,6 +770,3 @@ index 00000000..b82961d6
 +.BR service (8),
 +.SH AUTHOR
 +Benjamin Marzinski <bmarzins@redhat.com>
--- 
-2.17.2
-

SOURCES/0019-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch

@@ -14,23 +14,38 @@ multipathd.service
 
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
- libmultipath/wwids.c          | 44 +++++++++++++++++++++++++++++++++++
+ multipath/main.c              | 54 +++++++++++++++++++++++++++++++++--
- libmultipath/wwids.h          |  1 +
+ multipath/multipath.8         |  7 ++++-
- multipath/main.c              | 10 ++++++--
- multipath/multipath.8         |  7 +++++-
  multipathd/multipathd.service |  1 +
- 5 files changed, 60 insertions(+), 3 deletions(-)
+ 3 files changed, 59 insertions(+), 3 deletions(-)
 
-diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c
+diff --git a/multipath/main.c b/multipath/main.c
-index 28a2150d..fab6fc8f 100644
+index 65ece830..748e7902 100644
---- a/libmultipath/wwids.c
+--- a/multipath/main.c
-+++ b/libmultipath/wwids.c
++++ b/multipath/main.c
-@@ -454,3 +454,47 @@ int op ## _wwid(const char *wwid) \
+@@ -122,7 +122,7 @@ usage (char * progname)
- declare_failed_wwid_op(is_failed, false)
+ 	fprintf (stderr, "  %s [-v level] [-R retries] -F\n", progname);
- declare_failed_wwid_op(mark_failed, true)
+ 	fprintf (stderr, "  %s [-v level] [-l|-ll] [device]\n", progname);
- declare_failed_wwid_op(unmark_failed, true)
+ 	fprintf (stderr, "  %s [-v level] [-a|-w] device\n", progname);
-+
+-	fprintf (stderr, "  %s [-v level] -W\n", progname);
-+int remember_cmdline_wwid(void)
++	fprintf (stderr, "  %s [-v level] [-A|-W]\n", progname);
+ 	fprintf (stderr, "  %s [-v level] [-i] [-c|-C] device\n", progname);
+ 	fprintf (stderr, "  %s [-v level] [-i] [-u|-U]\n", progname);
+ 	fprintf (stderr, "  %s [-h|-t|-T]\n", progname);
+@@ -136,6 +136,8 @@ usage (char * progname)
+ 		"  -f      flush a multipath device map\n"
+ 		"  -F      flush all multipath device maps\n"
+ 		"  -a      add a device wwid to the wwids file\n"
++		"  -A      add devices from kernel command line mpath.wwids\n"
++		"          parameters to wwids file\n"
+ 		"  -c      check if a device should be a path in a multipath device\n"
+ 		"  -C      check if a multipath device has usable paths\n"
+ 		"  -q      allow queue_if_no_path when multipathd is not running\n"
+@@ -450,6 +452,50 @@ static void cleanup_vecs(void)
+ 	free_pathvec(vecs.pathvec, FREE_PATHS);
+ }
+ 
++static int remember_cmdline_wwid(void)
 +{
 +	FILE *f = NULL;
 +	char buf[LINE_MAX], *next, *ptr;
@@ -73,50 +88,20 @@ index 28a2150d..fab6fc8f 100644
 +	}
 +	return ret;
 +}
-diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h
++
-index 0c6ee54d..e32a0b0e 100644
+ static int
---- a/libmultipath/wwids.h
+ configure (struct config *conf, enum mpath_cmds cmd,
-+++ b/libmultipath/wwids.h
+ 	   enum devtypes dev_type, char *devpath)
-@@ -17,6 +17,7 @@ int remember_wwid(char *wwid);
+@@ -838,7 +884,7 @@ main (int argc, char *argv[])
- int check_wwids_file(char *wwid, int write_wwid);
- int remove_wwid(char *wwid);
- int replace_wwids(vector mp);
-+int remember_cmdline_wwid(void);
- 
- enum {
- 	WWID_IS_NOT_FAILED = 0,
-diff --git a/multipath/main.c b/multipath/main.c
-index cf9d2a28..78822ee1 100644
---- a/multipath/main.c
-+++ b/multipath/main.c
-@@ -138,7 +138,7 @@ usage (char * progname)
- 	fprintf (stderr, "  %s [-v level] [-R retries] -F\n", progname);
- 	fprintf (stderr, "  %s [-v level] [-l|-ll] [device]\n", progname);
- 	fprintf (stderr, "  %s [-v level] [-a|-w] device\n", progname);
--	fprintf (stderr, "  %s [-v level] -W\n", progname);
-+	fprintf (stderr, "  %s [-v level] [-A|-W]\n", progname);
- 	fprintf (stderr, "  %s [-v level] [-i] [-c|-C] device\n", progname);
- 	fprintf (stderr, "  %s [-v level] [-i] [-u|-U]\n", progname);
- 	fprintf (stderr, "  %s [-h|-t|-T]\n", progname);
-@@ -151,6 +151,8 @@ usage (char * progname)
- 		"  -f      flush a multipath device map\n"
- 		"  -F      flush all multipath device maps\n"
- 		"  -a      add a device wwid to the wwids file\n"
-+		"  -A      add devices from kernel command line mpath.wwids\n"
-+		"          parameters to wwids file\n"
- 		"  -c      check if a device should be a path in a multipath device\n"
- 		"  -C      check if a multipath device has usable paths\n"
- 		"  -q      allow queue_if_no_path when multipathd is not running\n"
-@@ -907,7 +909,7 @@ main (int argc, char *argv[])
- 	multipath_conf = conf;
  	conf->retrigger_tries = 0;
  	conf->force_sync = 1;
--	while ((arg = getopt(argc, argv, ":adcChl::FfM:v:p:b:BrR:itTquUwW")) != EOF ) {
+ 	atexit(cleanup_vecs);
-+	while ((arg = getopt(argc, argv, ":aAdcChl::FfM:v:p:b:BrR:itTquUwW")) != EOF ) {
+-	while ((arg = getopt(argc, argv, ":adDcChl::eFfM:v:p:b:BrR:itTquUwW")) != EOF ) {
++	while ((arg = getopt(argc, argv, ":aAdDcChl::eFfM:v:p:b:BrR:itTquUwW")) != EOF ) {
  		switch(arg) {
  		case 1: printf("optarg : %s\n",optarg);
  			break;
-@@ -977,6 +979,10 @@ main (int argc, char *argv[])
+@@ -915,6 +961,10 @@ main (int argc, char *argv[])
  		case 'T':
  			cmd = CMD_DUMP_CONFIG;
  			break;
@@ -128,7 +113,7 @@ index cf9d2a28..78822ee1 100644
  			usage(argv[0]);
  			exit(RTVL_OK);
 diff --git a/multipath/multipath.8 b/multipath/multipath.8
-index 9cdd05a3..8befc45a 100644
+index 17df59f5..5ca75359 100644
 --- a/multipath/multipath.8
 +++ b/multipath/multipath.8
 @@ -63,7 +63,7 @@ multipath \- Device mapper target autoconfig.
@@ -153,10 +138,10 @@ index 9cdd05a3..8befc45a 100644
  Remove the WWID for the specified device from the WWIDs file.
  .
 diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service
-index 17434cef..0fbcc46b 100644
+index 6d57c7e8..dfc1e962 100644
 --- a/multipathd/multipathd.service
 +++ b/multipathd/multipathd.service
-@@ -15,6 +15,7 @@ Type=notify
+@@ -16,6 +16,7 @@ Type=notify
  NotifyAccess=main
  LimitCORE=infinity
  ExecStartPre=-/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath
@@ -164,6 +149,3 @@ index 17434cef..0fbcc46b 100644
  ExecStart=/sbin/multipathd -d -s
  ExecReload=/sbin/multipathd reconfigure
  TasksMax=infinity
--- 
-2.17.2
-

SOURCES/0020-RH-reset-default-find_mutipaths-value-to-off.patch

@@ -12,10 +12,10 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
-index e5ee6afe..52fe05b9 100644
+index c27946c7..e0dd32ad 100644
 --- a/libmultipath/defaults.h
 +++ b/libmultipath/defaults.h
-@@ -22,7 +22,7 @@
+@@ -23,7 +23,7 @@
  #define DEFAULT_NO_PATH_RETRY	NO_PATH_RETRY_UNDEF
  #define DEFAULT_VERBOSITY	2
  #define DEFAULT_REASSIGN_MAPS	0
@@ -24,6 +24,3 @@ index e5ee6afe..52fe05b9 100644
  #define DEFAULT_FAST_IO_FAIL	5
  #define DEFAULT_DEV_LOSS_TMO	600
  #define DEFAULT_RETAIN_HWHANDLER RETAIN_HWHANDLER_ON
--- 
-2.17.2
-

SOURCES/0021-RH-attempt-to-get-ANA-info-via-sysfs-first.patch

@@ -82,6 +82,3 @@ index b5c7873d..e139360c 100644
  
  	switch (rc) {
  	case NVME_ANA_OPTIMIZED:
--- 
-2.17.2
-

SOURCES/0021-libmultipath-remove-_blacklist_exceptions-functions.patch

@@ -1,139 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Mon, 8 Jun 2020 14:27:51 -0500
-Subject: [PATCH] libmultipath: remove _blacklist_exceptions functions
-
-_blacklist_exceptions() and _blacklist_exceptions_device() are exactly
-the same as _blacklist() and _blacklist_device(), so remove them, and
-give the remaining functions to a more general name.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/blacklist.c | 62 ++++++++++------------------------------
- 1 file changed, 15 insertions(+), 47 deletions(-)
-
-diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
-index d9691b17..04d3adb9 100644
---- a/libmultipath/blacklist.c
-+++ b/libmultipath/blacklist.c
-@@ -101,21 +101,8 @@ int set_ble_device(vector blist, char * vendor, char * product, int origin)
- 	return 0;
- }
- 
--int
--_blacklist_exceptions (vector elist, const char * str)
--{
--	int i;
--	struct blentry * ele;
--
--	vector_foreach_slot (elist, ele, i) {
--		if (!regexec(&ele->regex, str, 0, NULL, 0))
--			return 1;
--	}
--	return 0;
--}
--
--int
--_blacklist (vector blist, const char * str)
-+static int
-+match_reglist (vector blist, const char * str)
- {
- 	int i;
- 	struct blentry * ble;
-@@ -127,28 +114,9 @@ _blacklist (vector blist, const char * str)
- 	return 0;
- }
- 
--int
--_blacklist_exceptions_device(const struct _vector *elist, const char * vendor,
--			     const char * product)
--{
--	int i;
--	struct blentry_device * ble;
--
--	vector_foreach_slot (elist, ble, i) {
--		if (!ble->vendor && !ble->product)
--			continue;
--		if ((!ble->vendor ||
--		     !regexec(&ble->vendor_reg, vendor, 0, NULL, 0)) &&
--		    (!ble->product ||
--		     !regexec(&ble->product_reg, product, 0, NULL, 0)))
--			return 1;
--	}
--	return 0;
--}
--
--int
--_blacklist_device (const struct _vector *blist, const char * vendor,
--		   const char * product)
-+static int
-+match_reglist_device (const struct _vector *blist, const char * vendor,
-+		    const char * product)
- {
- 	int i;
- 	struct blentry_device * ble;
-@@ -294,9 +262,9 @@ filter_device (vector blist, vector elist, char * vendor, char * product,
- 	int r = MATCH_NOTHING;
- 
- 	if (vendor && product) {
--		if (_blacklist_exceptions_device(elist, vendor, product))
-+		if (match_reglist_device(elist, vendor, product))
- 			r = MATCH_DEVICE_BLIST_EXCEPT;
--		else if (_blacklist_device(blist, vendor, product))
-+		else if (match_reglist_device(blist, vendor, product))
- 			r = MATCH_DEVICE_BLIST;
- 	}
- 
-@@ -310,9 +278,9 @@ filter_devnode (vector blist, vector elist, char * dev)
- 	int r = MATCH_NOTHING;
- 
- 	if (dev) {
--		if (_blacklist_exceptions(elist, dev))
-+		if (match_reglist(elist, dev))
- 			r = MATCH_DEVNODE_BLIST_EXCEPT;
--		else if (_blacklist(blist, dev))
-+		else if (match_reglist(blist, dev))
- 			r = MATCH_DEVNODE_BLIST;
- 	}
- 
-@@ -326,9 +294,9 @@ filter_wwid (vector blist, vector elist, char * wwid, char * dev)
- 	int r = MATCH_NOTHING;
- 
- 	if (wwid) {
--		if (_blacklist_exceptions(elist, wwid))
-+		if (match_reglist(elist, wwid))
- 			r = MATCH_WWID_BLIST_EXCEPT;
--		else if (_blacklist(blist, wwid))
-+		else if (match_reglist(blist, wwid))
- 			r = MATCH_WWID_BLIST;
- 	}
- 
-@@ -345,9 +313,9 @@ filter_protocol(vector blist, vector elist, struct path * pp)
- 	if (pp) {
- 		snprint_path_protocol(buf, sizeof(buf), pp);
- 
--		if (_blacklist_exceptions(elist, buf))
-+		if (match_reglist(elist, buf))
- 			r = MATCH_PROTOCOL_BLIST_EXCEPT;
--		else if (_blacklist(blist, buf))
-+		else if (match_reglist(blist, buf))
- 			r = MATCH_PROTOCOL_BLIST;
- 	}
- 
-@@ -417,11 +385,11 @@ filter_property(struct config *conf, struct udev_device *udev, int lvl,
- 			if (check_missing_prop && !strcmp(env, uid_attribute))
- 				uid_attr_seen = true;
- 
--			if (_blacklist_exceptions(conf->elist_property, env)) {
-+			if (match_reglist(conf->elist_property, env)) {
- 				r = MATCH_PROPERTY_BLIST_EXCEPT;
- 				break;
- 			}
--			if (_blacklist(conf->blist_property, env)) {
-+			if (match_reglist(conf->blist_property, env)) {
- 				r = MATCH_PROPERTY_BLIST;
- 				break;
- 			}
--- 
-2.17.2
-

SOURCES/0022-RH-make-parse_vpd_pg83-match-scsi_id-output.patch

@@ -0,0 +1,102 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Benjamin Marzinski <bmarzins@redhat.com>
+Date: Thu, 25 Mar 2021 13:05:10 -0500
+Subject: [PATCH] RH: make parse_vpd_pg83 match scsi_id output
+
+Red Hat sets ID_SERIAL based on the result of scsi_id, instead of using
+the result of sg_inq and 55-scsi-sg3_id.rules. Make parse_vpd_pg83 match
+that.
+
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ libmultipath/discovery.c | 18 ++----------------
+ tests/vpd.c              |  6 ++++++
+ 2 files changed, 8 insertions(+), 16 deletions(-)
+
+diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
+index f25fe9e3..6fb81c28 100644
+--- a/libmultipath/discovery.c
++++ b/libmultipath/discovery.c
+@@ -1136,12 +1136,9 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len,
+ 				naa_prio = 7;
+ 				break;
+ 			case 2:
+-				/* IEEE Extended: Prio 6 */
+-				naa_prio = 6;
+-				break;
+ 			case 3:
+-				/* IEEE Locally assigned: Prio 1 */
+-				naa_prio = 1;
++				/* IEEE Extended or Locally assigned: Prio 6 */
++				naa_prio = 6;
+ 				break;
+ 			default:
+ 				/* Default: no priority */
+@@ -1160,17 +1157,6 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len,
+ 				vpd = d;
+ 			}
+ 			break;
+-		case 0x8:
+-			/* SCSI Name: Prio 3 */
+-			if (memcmp(d + 4, "eui.", 4) &&
+-			    memcmp(d + 4, "naa.", 4) &&
+-			    memcmp(d + 4, "iqn.", 4))
+-				break;
+-			if (prio < 3) {
+-				prio = 3;
+-				vpd = d;
+-			}
+-			break;
+ 		case 0x1:
+ 			/* T-10 Vendor ID: Prio 2 */
+ 			if (prio < 2) {
+diff --git a/tests/vpd.c b/tests/vpd.c
+index 8e730d37..7bf7990f 100644
+--- a/tests/vpd.c
++++ b/tests/vpd.c
+@@ -230,11 +230,13 @@ static const char * const str_prefix[] = {
+ 	[STR_IQN] = "iqn.",
+ };
+ 
++#if 0
+ static const char byte0[] = {
+ 	[STR_EUI] = '2',
+ 	[STR_NAA] = '3',
+ 	[STR_IQN] = '8',
+ };
++#endif
+ 
+ /**
+  * create_scsi_string_desc() - create a SCSI name string descriptor.
+@@ -659,6 +661,7 @@ make_test_vpd_naa(2, 18);
+ make_test_vpd_naa(2, 17);
+ make_test_vpd_naa(2, 16);
+ 
++#if 0
+ /* SCSI Name string: EUI64, WWID size: 17 */
+ make_test_vpd_str(0, 20, 18)
+ make_test_vpd_str(0, 20, 17)
+@@ -694,6 +697,7 @@ make_test_vpd_str(18, 20, 18)
+ make_test_vpd_str(18, 20, 17)
+ make_test_vpd_str(18, 20, 16)
+ make_test_vpd_str(18, 20, 15)
++#endif
+ 
+ static int test_vpd(void)
+ {
+@@ -767,6 +771,7 @@ static int test_vpd(void)
+ 		cmocka_unit_test(test_vpd_naa_2_18),
+ 		cmocka_unit_test(test_vpd_naa_2_17),
+ 		cmocka_unit_test(test_vpd_naa_2_16),
++/*
+ 		cmocka_unit_test(test_vpd_str_0_20_18),
+ 		cmocka_unit_test(test_vpd_str_0_20_17),
+ 		cmocka_unit_test(test_vpd_str_0_20_16),
+@@ -791,6 +796,7 @@ static int test_vpd(void)
+ 		cmocka_unit_test(test_vpd_str_18_20_17),
+ 		cmocka_unit_test(test_vpd_str_18_20_16),
+ 		cmocka_unit_test(test_vpd_str_18_20_15),
++*/
+ 	};
+ 	return cmocka_run_group_tests(tests, setup, teardown);
+ }

SOURCES/0022-libmultipath-fix-parser-issue-with-comments-in-strin.patch

@@ -1,95 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Mon, 8 Jun 2020 20:23:56 -0500
-Subject: [PATCH] libmultipath: fix parser issue with comments in strings
-
-If a quoted string starts with '#' or '!', the parser will stop
-parsing the line, thinking that it's a comment.  It should only
-be checking for comments outside of quoted strings. Fixed this and
-added unit tests to verify it.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/parser.c |  4 +++-
- tests/parser.c        | 42 ++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 45 insertions(+), 1 deletion(-)
-
-diff --git a/libmultipath/parser.c b/libmultipath/parser.c
-index a184511b..a7285a35 100644
---- a/libmultipath/parser.c
-+++ b/libmultipath/parser.c
-@@ -300,8 +300,10 @@ alloc_strvec(char *string)
- 			(isspace((int) *cp) || !isascii((int) *cp)))
- 		       && *cp != '\0')
- 			cp++;
--		if (*cp == '\0' || *cp == '!' || *cp == '#')
-+		if (*cp == '\0' ||
-+		    (!in_string && (*cp == '!' || *cp == '#'))) {
- 			return strvec;
-+		}
- 	}
- out:
- 	vector_free(strvec);
-diff --git a/tests/parser.c b/tests/parser.c
-index 29859dac..5772391e 100644
---- a/tests/parser.c
-+++ b/tests/parser.c
-@@ -440,6 +440,46 @@ static void test18(void **state)
- 	free_strvec(v);
- }
- 
-+static void test19(void **state)
-+{
-+#define QUOTED19 "!value"
-+	vector v = alloc_strvec("key \"" QUOTED19 "\"");
-+	char *val;
-+
-+	assert_int_equal(VECTOR_SIZE(v), 4);
-+	assert_string_equal(VECTOR_SLOT(v, 0), "key");
-+	assert_true(is_quote(VECTOR_SLOT(v, 1)));
-+	assert_string_equal(VECTOR_SLOT(v, 2), QUOTED19);
-+	assert_true(is_quote(VECTOR_SLOT(v, 3)));
-+	assert_int_equal(validate_config_strvec(v, test_file), 0);
-+
-+	val = set_value(v);
-+	assert_string_equal(val, QUOTED19);
-+
-+	free(val);
-+	free_strvec(v);
-+}
-+
-+static void test20(void **state)
-+{
-+#define QUOTED20 "#value"
-+	vector v = alloc_strvec("key \"" QUOTED20 "\"");
-+	char *val;
-+
-+	assert_int_equal(VECTOR_SIZE(v), 4);
-+	assert_string_equal(VECTOR_SLOT(v, 0), "key");
-+	assert_true(is_quote(VECTOR_SLOT(v, 1)));
-+	assert_string_equal(VECTOR_SLOT(v, 2), QUOTED20);
-+	assert_true(is_quote(VECTOR_SLOT(v, 3)));
-+	assert_int_equal(validate_config_strvec(v, test_file), 0);
-+
-+	val = set_value(v);
-+	assert_string_equal(val, QUOTED20);
-+
-+	free(val);
-+	free_strvec(v);
-+}
-+
- int test_config_parser(void)
- {
- 	const struct CMUnitTest tests[] = {
-@@ -461,6 +501,8 @@ int test_config_parser(void)
- 		cmocka_unit_test(test16),
- 		cmocka_unit_test(test17),
- 		cmocka_unit_test(test18),
-+		cmocka_unit_test(test19),
-+		cmocka_unit_test(test20),
- 	};
- 	return cmocka_run_group_tests(tests, setup, teardown);
- }
--- 
-2.17.2
-

SOURCES/0023-libmultipath-add-section-name-to-invalid-keyword-out.patch

@@ -1,37 +1,36 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Thu, 23 Sep 2021 14:16:51 -0500
-Subject: [PATCH] libmulitpath: add section name to invalid keyword output
+Subject: [PATCH] libmultipath: add section name to invalid keyword output
 
 If users forget the closing brace for a section in multipath.conf,
 multipath has no way to detect that. When it sees the keyword at the
 start of the next section, it will complain that there is an invalid
 keyword, because that keyword doesn't belong in previous section (which
 was never ended with a closing brace). This can confuse users. To make
-this easier to understand, when multipath prints and invalid keyword
+this easier to understand, when multipath prints an invalid keyword
 message, it now also prints the current section name, which can give
 users a hint that they didn't end the previous section.
 
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
- libmultipath/parser.c | 21 ++++++++++++++-------
+ libmultipath/parser.c | 20 +++++++++++++-------
- 1 file changed, 14 insertions(+), 7 deletions(-)
+ 1 file changed, 13 insertions(+), 7 deletions(-)
 
 diff --git a/libmultipath/parser.c b/libmultipath/parser.c
-index 48b54e87..96b95936 100644
+index 8ca91bf2..611054f7 100644
 --- a/libmultipath/parser.c
 +++ b/libmultipath/parser.c
-@@ -507,7 +507,8 @@ validate_config_strvec(vector strvec, char *file)
+@@ -504,7 +504,7 @@ validate_config_strvec(vector strvec, const char *file)
- }
  
  static int
--process_stream(struct config *conf, FILE *stream, vector keywords, char *file)
+ process_stream(struct config *conf, FILE *stream, vector keywords,
-+process_stream(struct config *conf, FILE *stream, vector keywords,
+-	       const char *file)
-+	       const char *section, char *file)
++	       const char *section, const char *file)
  {
  	int i;
  	int r = 0, t;
-@@ -571,16 +572,22 @@ process_stream(struct config *conf, FILE *stream, vector keywords, char *file)
+@@ -568,16 +568,22 @@ process_stream(struct config *conf, FILE *stream, vector keywords,
  				if (keyword->sub) {
  					kw_level++;
  					r += process_stream(conf, stream,
@@ -59,7 +58,7 @@ index 48b54e87..96b95936 100644
  		free_strvec(strvec);
  	}
  	if (kw_level == 1)
-@@ -611,7 +618,7 @@ process_file(struct config *conf, char *file)
+@@ -608,7 +614,7 @@ process_file(struct config *conf, const char *file)
  
  	/* Stream handling */
  	line_nr = 0;

SOURCES/0023-libmultipath-invert-regexes-that-start-with-exclamat.patch

@@ -1,435 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Mon, 8 Jun 2020 13:40:16 -0500
-Subject: [PATCH] libmultipath: invert regexes that start with exclamation
- point
-
-The number of devices that multipath needs to blacklist keeps growing,
-and the udev rules already have
-
-KERNEL!="sd*|dasd*|nvme*", GOTO="end_mpath"
-
-so they only work correctly with these device types.  Instead of
-individually blacklisting every type of device that can't be
-multipathed, multipath's default blacklist should work like the udev
-rule, and blacklist all devices that aren't scsi, dasd, or nvme.
-Unfortunately, the c regex library doesn't support negative lookahead.
-Instead, multipath should treat "!" at the beginning of
-blacklist/exceptions regexes as inverse matching the rest of the regex.
-If users need to match a literal '!' as the first character of their
-regex, they can use "\!" instead. This allows multipath to change the
-default devnode blacklist regex to "!^(sd[a-z]|dasd[a-z]|nvme[0-9])".
-
-Extra tests have been added to the blacklist unit tests to verify the
-inverse matching code and the new default blacklist.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/blacklist.c   |  41 +++++++++-----
- libmultipath/blacklist.h   |   3 +
- multipath/multipath.conf.5 |  17 ++++--
- tests/blacklist.c          | 110 +++++++++++++++++++++++++++++++++++++
- tests/test-lib.c           |   2 +-
- 5 files changed, 155 insertions(+), 18 deletions(-)
-
-diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
-index 04d3adb9..0c58aa32 100644
---- a/libmultipath/blacklist.c
-+++ b/libmultipath/blacklist.c
-@@ -15,9 +15,24 @@
- #include "structs_vec.h"
- #include "print.h"
- 
-+char *check_invert(char *str, bool *invert)
-+{
-+	if (str[0] == '!') {
-+		*invert = true;
-+		return str + 1;
-+	}
-+	if (str[0] == '\\' && str[1] == '!') {
-+		*invert = false;
-+		return str + 1;
-+	}
-+	*invert = false;
-+	return str;
-+}
-+
- int store_ble(vector blist, char * str, int origin)
- {
- 	struct blentry * ble;
-+	char *regex_str;
- 
- 	if (!str)
- 		return 0;
-@@ -30,7 +45,8 @@ int store_ble(vector blist, char * str, int origin)
- 	if (!ble)
- 		goto out;
- 
--	if (regcomp(&ble->regex, str, REG_EXTENDED|REG_NOSUB))
-+	regex_str = check_invert(str, &ble->invert);
-+	if (regcomp(&ble->regex, regex_str, REG_EXTENDED|REG_NOSUB))
- 		goto out1;
- 
- 	if (!vector_alloc_slot(blist))
-@@ -66,6 +82,7 @@ int alloc_ble_device(vector blist)
- int set_ble_device(vector blist, char * vendor, char * product, int origin)
- {
- 	struct blentry_device * ble;
-+	char *regex_str;
- 
- 	if (!blist)
- 		return 1;
-@@ -76,7 +93,8 @@ int set_ble_device(vector blist, char * vendor, char * product, int origin)
- 		return 1;
- 
- 	if (vendor) {
--		if (regcomp(&ble->vendor_reg, vendor,
-+		regex_str = check_invert(vendor, &ble->vendor_invert);
-+		if (regcomp(&ble->vendor_reg, regex_str,
- 			    REG_EXTENDED|REG_NOSUB)) {
- 			FREE(vendor);
- 			if (product)
-@@ -86,7 +104,8 @@ int set_ble_device(vector blist, char * vendor, char * product, int origin)
- 		ble->vendor = vendor;
- 	}
- 	if (product) {
--		if (regcomp(&ble->product_reg, product,
-+		regex_str = check_invert(product, &ble->product_invert);
-+		if (regcomp(&ble->product_reg, regex_str,
- 			    REG_EXTENDED|REG_NOSUB)) {
- 			FREE(product);
- 			if (vendor) {
-@@ -108,7 +127,7 @@ match_reglist (vector blist, const char * str)
- 	struct blentry * ble;
- 
- 	vector_foreach_slot (blist, ble, i) {
--		if (!regexec(&ble->regex, str, 0, NULL, 0))
-+		if (!!regexec(&ble->regex, str, 0, NULL, 0) == ble->invert)
- 			return 1;
- 	}
- 	return 0;
-@@ -125,9 +144,11 @@ match_reglist_device (const struct _vector *blist, const char * vendor,
- 		if (!ble->vendor && !ble->product)
- 			continue;
- 		if ((!ble->vendor ||
--		     !regexec(&ble->vendor_reg, vendor, 0, NULL, 0)) &&
-+		     !!regexec(&ble->vendor_reg, vendor, 0, NULL, 0) ==
-+		     ble->vendor_invert) &&
- 		    (!ble->product ||
--		     !regexec(&ble->product_reg, product, 0, NULL, 0)))
-+		     !!regexec(&ble->product_reg, product, 0, NULL, 0) ==
-+		     ble->product_invert))
- 			return 1;
- 	}
- 	return 0;
-@@ -160,13 +181,7 @@ setup_default_blist (struct config * conf)
- 	char * str;
- 	int i;
- 
--	str = STRDUP("^(ram|zram|raw|loop|fd|md|dm-|sr|scd|st|dcssblk)[0-9]");
--	if (!str)
--		return 1;
--	if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
--		return 1;
--
--	str = STRDUP("^(td|hd|vd)[a-z]");
-+	str = STRDUP("!^(sd[a-z]|dasd[a-z]|nvme[0-9])");
- 	if (!str)
- 		return 1;
- 	if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
-diff --git a/libmultipath/blacklist.h b/libmultipath/blacklist.h
-index 2d721f60..4305857d 100644
---- a/libmultipath/blacklist.h
-+++ b/libmultipath/blacklist.h
-@@ -20,6 +20,7 @@
- struct blentry {
- 	char * str;
- 	regex_t regex;
-+	bool invert;
- 	int origin;
- };
- 
-@@ -28,6 +29,8 @@ struct blentry_device {
- 	char * product;
- 	regex_t vendor_reg;
- 	regex_t product_reg;
-+	bool vendor_invert;
-+	bool product_invert;
- 	int origin;
- };
- 
-diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
-index 3455b1cc..6dc26f10 100644
---- a/multipath/multipath.conf.5
-+++ b/multipath/multipath.conf.5
-@@ -1248,6 +1248,16 @@ being handled by multipath-tools.
- .LP
- .
- .
-+In the \fIblacklist\fR and \fIblacklist_exceptions\fR sections, starting a
-+quoted value with an exclamation mark \fB"!"\fR will invert the matching
-+of the rest of the regular expression. For instance, \fB"!^sd[a-z]"\fR will
-+match all values that do not start with \fB"sd[a-z]"\fR. The exclamation mark
-+can be escaped \fB"\\!"\fR to match a literal \fB!\fR at the start of a
-+regular expression. \fBNote:\fR The exclamation mark must be inside quotes,
-+otherwise it will be treated as starting a comment.
-+.LP
-+.
-+.
- The \fIblacklist_exceptions\fR section is used to revert the actions of the
- \fIblacklist\fR section. This allows one to selectively include ("whitelist") devices which
- would normally be excluded via the \fIblacklist\fR section. A common usage is
-@@ -1264,10 +1274,9 @@ unless explicitly stated.
- Regular expression matching the device nodes to be excluded/included.
- .RS
- .PP
--The default \fIblacklist\fR consists of the regular expressions
--"^(ram|zram|raw|loop|fd|md|dm-|sr|scd|st|dcssblk)[0-9]" and
--"^(td|hd|vd)[a-z]". This causes virtual devices, non-disk devices, and some other
--device types to be excluded from multipath handling by default.
-+The default \fIblacklist\fR consists of the regular expression
-+\fB"!^(sd[a-z]|dasd[a-z]|nvme[0-9])"\fR. This causes all device types other
-+than scsi, dasd, and nvme to be excluded from multipath handling by default.
- .RE
- .TP
- .B wwid
-diff --git a/tests/blacklist.c b/tests/blacklist.c
-index cc8a9a4a..d20e97af 100644
---- a/tests/blacklist.c
-+++ b/tests/blacklist.c
-@@ -60,20 +60,46 @@ __wrap_udev_list_entry_get_name(struct udev_list_entry *list_entry)
- 	return *(const char **)list_entry;
- }
- 
-+vector elist_property_default;
-+vector blist_devnode_default;
- vector blist_devnode_sdb;
-+vector blist_devnode_sdb_inv;
- vector blist_all;
- vector blist_device_foo_bar;
-+vector blist_device_foo_inv_bar;
-+vector blist_device_foo_bar_inv;
- vector blist_device_all;
- vector blist_wwid_xyzzy;
-+vector blist_wwid_xyzzy_inv;
- vector blist_protocol_fcp;
-+vector blist_protocol_fcp_inv;
- vector blist_property_wwn;
-+vector blist_property_wwn_inv;
- 
- static int setup(void **state)
- {
-+	struct config conf;
-+
-+	memset(&conf, 0, sizeof(conf));
-+	conf.blist_devnode = vector_alloc();
-+	if (!conf.blist_devnode)
-+		return -1;
-+	conf.elist_property = vector_alloc();
-+	if (!conf.elist_property)
-+		return -1;
-+	if (setup_default_blist(&conf) != 0)
-+		return -1;
-+	elist_property_default = conf.elist_property;
-+	blist_devnode_default = conf.blist_devnode;
-+
- 	blist_devnode_sdb = vector_alloc();
- 	if (!blist_devnode_sdb ||
- 	    store_ble(blist_devnode_sdb, strdup("sdb"), ORIGIN_CONFIG))
- 		return -1;
-+	blist_devnode_sdb_inv = vector_alloc();
-+	if (!blist_devnode_sdb_inv ||
-+	    store_ble(blist_devnode_sdb_inv, strdup("!sdb"), ORIGIN_CONFIG))
-+		return -1;
- 
- 	blist_all = vector_alloc();
- 	if (!blist_all || store_ble(blist_all, strdup(".*"), ORIGIN_CONFIG))
-@@ -84,6 +110,18 @@ static int setup(void **state)
- 	    set_ble_device(blist_device_foo_bar, strdup("foo"), strdup("bar"),
- 			   ORIGIN_CONFIG))
- 		return -1;
-+	blist_device_foo_inv_bar = vector_alloc();
-+	if (!blist_device_foo_inv_bar ||
-+	    alloc_ble_device(blist_device_foo_inv_bar) ||
-+	    set_ble_device(blist_device_foo_inv_bar, strdup("!foo"),
-+			   strdup("bar"), ORIGIN_CONFIG))
-+		return -1;
-+	blist_device_foo_bar_inv = vector_alloc();
-+	if (!blist_device_foo_bar_inv ||
-+	    alloc_ble_device(blist_device_foo_bar_inv) ||
-+	    set_ble_device(blist_device_foo_bar_inv, strdup("foo"),
-+			   strdup("!bar"), ORIGIN_CONFIG))
-+		return -1;
- 
- 	blist_device_all = vector_alloc();
- 	if (!blist_device_all || alloc_ble_device(blist_device_all) ||
-@@ -95,29 +133,50 @@ static int setup(void **state)
- 	if (!blist_wwid_xyzzy ||
- 	    store_ble(blist_wwid_xyzzy, strdup("xyzzy"), ORIGIN_CONFIG))
- 		return -1;
-+	blist_wwid_xyzzy_inv = vector_alloc();
-+	if (!blist_wwid_xyzzy_inv ||
-+	    store_ble(blist_wwid_xyzzy_inv, strdup("!xyzzy"), ORIGIN_CONFIG))
-+		return -1;
- 
- 	blist_protocol_fcp = vector_alloc();
- 	if (!blist_protocol_fcp ||
- 	    store_ble(blist_protocol_fcp, strdup("scsi:fcp"), ORIGIN_CONFIG))
- 		return -1;
-+	blist_protocol_fcp_inv = vector_alloc();
-+	if (!blist_protocol_fcp_inv ||
-+	    store_ble(blist_protocol_fcp_inv, strdup("!scsi:fcp"),
-+		      ORIGIN_CONFIG))
-+		return -1;
- 
- 	blist_property_wwn = vector_alloc();
- 	if (!blist_property_wwn ||
- 	    store_ble(blist_property_wwn, strdup("ID_WWN"), ORIGIN_CONFIG))
- 		return -1;
-+	blist_property_wwn_inv = vector_alloc();
-+	if (!blist_property_wwn_inv ||
-+	    store_ble(blist_property_wwn_inv, strdup("!ID_WWN"), ORIGIN_CONFIG))
-+		return -1;
- 
- 	return 0;
- }
- 
- static int teardown(void **state)
- {
-+	free_blacklist(elist_property_default);
-+	free_blacklist(blist_devnode_default);
- 	free_blacklist(blist_devnode_sdb);
-+	free_blacklist(blist_devnode_sdb_inv);
- 	free_blacklist(blist_all);
- 	free_blacklist_device(blist_device_foo_bar);
-+	free_blacklist_device(blist_device_foo_inv_bar);
-+	free_blacklist_device(blist_device_foo_bar_inv);
- 	free_blacklist_device(blist_device_all);
- 	free_blacklist(blist_wwid_xyzzy);
-+	free_blacklist(blist_wwid_xyzzy_inv);
- 	free_blacklist(blist_protocol_fcp);
-+	free_blacklist(blist_protocol_fcp_inv);
- 	free_blacklist(blist_property_wwn);
-+	free_blacklist(blist_property_wwn_inv);
- 	return 0;
- }
- 
-@@ -141,6 +200,11 @@ static void test_devnode_blacklist(void **state)
- 	expect_condlog(3, "sdb: device node name blacklisted\n");
- 	assert_int_equal(filter_devnode(blist_devnode_sdb, NULL, "sdb"),
- 			 MATCH_DEVNODE_BLIST);
-+	assert_int_equal(filter_devnode(blist_devnode_sdb_inv, NULL, "sdb"),
-+			 MATCH_NOTHING);
-+	expect_condlog(3, "sdc: device node name blacklisted\n");
-+	assert_int_equal(filter_devnode(blist_devnode_sdb_inv, NULL, "sdc"),
-+			 MATCH_DEVNODE_BLIST);
- }
- 
- static void test_devnode_whitelist(void **state)
-@@ -159,12 +223,39 @@ static void test_devnode_missing(void **state)
- 			 MATCH_NOTHING);
- }
- 
-+static void test_devnode_default(void **state)
-+{
-+	assert_int_equal(filter_devnode(blist_devnode_default, NULL, "sdaa"),
-+			 MATCH_NOTHING);
-+	assert_int_equal(filter_devnode(blist_devnode_default, NULL, "nvme0n1"),
-+			 MATCH_NOTHING);
-+	assert_int_equal(filter_devnode(blist_devnode_default, NULL, "dasda"),
-+			 MATCH_NOTHING);
-+	expect_condlog(3, "hda: device node name blacklisted\n");
-+	assert_int_equal(filter_devnode(blist_devnode_default, NULL, "hda"),
-+			 MATCH_DEVNODE_BLIST);
-+}
-+
- static void test_device_blacklist(void **state)
- {
- 	expect_condlog(3, "sdb: (foo:bar) vendor/product blacklisted\n");
- 	assert_int_equal(filter_device(blist_device_foo_bar, NULL, "foo",
- 				       "bar", "sdb"),
- 			 MATCH_DEVICE_BLIST);
-+	assert_int_equal(filter_device(blist_device_foo_inv_bar, NULL, "foo",
-+				        "bar", "sdb"),
-+			 MATCH_NOTHING);
-+	assert_int_equal(filter_device(blist_device_foo_bar_inv, NULL, "foo",
-+				        "bar", "sdb"),
-+			 MATCH_NOTHING);
-+	expect_condlog(3, "sdb: (baz:bar) vendor/product blacklisted\n");
-+	assert_int_equal(filter_device(blist_device_foo_inv_bar, NULL, "baz",
-+				        "bar", "sdb"),
-+			 MATCH_DEVICE_BLIST);
-+	expect_condlog(3, "sdb: (foo:baz) vendor/product blacklisted\n");
-+	assert_int_equal(filter_device(blist_device_foo_bar_inv, NULL, "foo",
-+				        "baz", "sdb"),
-+			 MATCH_DEVICE_BLIST);
- }
- 
- static void test_device_whitelist(void **state)
-@@ -191,6 +282,11 @@ static void test_wwid_blacklist(void **state)
- 	expect_condlog(3, "sdb: wwid xyzzy blacklisted\n");
- 	assert_int_equal(filter_wwid(blist_wwid_xyzzy, NULL, "xyzzy", "sdb"),
- 			 MATCH_WWID_BLIST);
-+	assert_int_equal(filter_wwid(blist_wwid_xyzzy_inv, NULL, "xyzzy",
-+				     "sdb"), MATCH_NOTHING);
-+	expect_condlog(3, "sdb: wwid plugh blacklisted\n");
-+	assert_int_equal(filter_wwid(blist_wwid_xyzzy_inv, NULL, "plugh",
-+				     "sdb"), MATCH_WWID_BLIST);
- }
- 
- static void test_wwid_whitelist(void **state)
-@@ -218,6 +314,12 @@ static void test_protocol_blacklist(void **state)
- 	expect_condlog(3, "sdb: protocol scsi:fcp blacklisted\n");
- 	assert_int_equal(filter_protocol(blist_protocol_fcp, NULL, &pp),
- 			 MATCH_PROTOCOL_BLIST);
-+	assert_int_equal(filter_protocol(blist_protocol_fcp_inv, NULL, &pp),
-+			 MATCH_NOTHING);
-+	pp.sg_id.proto_id = SCSI_PROTOCOL_ATA;
-+	expect_condlog(3, "sdb: protocol scsi:ata blacklisted\n");
-+	assert_int_equal(filter_protocol(blist_protocol_fcp_inv, NULL, &pp),
-+			 MATCH_PROTOCOL_BLIST);
- }
- 
- static void test_protocol_whitelist(void **state)
-@@ -245,10 +347,17 @@ static void test_protocol_missing(void **state)
- static void test_property_blacklist(void **state)
- {
- 	static struct udev_device udev = { "sdb", { "ID_FOO", "ID_WWN", "ID_BAR", NULL } };
-+	static struct udev_device udev_inv = { "sdb", { "ID_WWN", NULL } };
- 	conf.blist_property = blist_property_wwn;
- 	expect_condlog(3, "sdb: udev property ID_WWN blacklisted\n");
- 	assert_int_equal(filter_property(&conf, &udev, 3, "ID_SERIAL"),
- 			 MATCH_PROPERTY_BLIST);
-+	conf.blist_property = blist_property_wwn_inv;
-+	expect_condlog(3, "sdb: udev property ID_FOO blacklisted\n");
-+	assert_int_equal(filter_property(&conf, &udev, 3, "ID_SERIAL"),
-+			 MATCH_PROPERTY_BLIST);
-+	assert_int_equal(filter_property(&conf, &udev_inv, 3, "ID_SERIAL"),
-+			 MATCH_NOTHING);
- }
- 
- /* the property check works different in that you check all the property
-@@ -482,6 +591,7 @@ int test_blacklist(void)
- 		cmocka_unit_test(test_devnode_blacklist),
- 		cmocka_unit_test(test_devnode_whitelist),
- 		cmocka_unit_test(test_devnode_missing),
-+		cmocka_unit_test(test_devnode_default),
- 		cmocka_unit_test(test_device_blacklist),
- 		cmocka_unit_test(test_device_whitelist),
- 		cmocka_unit_test(test_device_missing),
-diff --git a/tests/test-lib.c b/tests/test-lib.c
-index 59275163..08ff2d8d 100644
---- a/tests/test-lib.c
-+++ b/tests/test-lib.c
-@@ -15,7 +15,7 @@
- #include "test-lib.h"
- 
- const int default_mask = (DI_SYSFS|DI_BLACKLIST|DI_WWID|DI_CHECKER|DI_PRIO);
--const char default_devnode[] = "sdTEST";
-+const char default_devnode[] = "sdxTEST";
- const char default_wwid[] = "TEST-WWID";
- /* default_wwid should be a substring of default_wwid_1! */
- const char default_wwid_1[] = "TEST-WWID-1";
--- 
-2.17.2
-

SOURCES/0024-libmultipath-make-dm_get_map-status-return-codes-sym.patch

@@ -1,322 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Tue, 23 Jun 2020 22:17:31 -0500
-Subject: [PATCH] libmultipath: make dm_get_map/status return codes symbolic
-
-dm_get_map() and dm_get_status() now use symbolic return codes. They
-also differentiate between failing to get information from device-mapper
-and not finding the requested device. These symboilc return codes are
-also used by update_multipath_* functions.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/devmapper.c   | 51 +++++++++++++++++++++++++-------------
- libmultipath/devmapper.h   |  6 +++++
- libmultipath/structs_vec.c | 45 +++++++++++++++++++--------------
- multipathd/main.c          | 12 ++++-----
- 4 files changed, 72 insertions(+), 42 deletions(-)
-
-diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
-index 13a1cf53..f6204e5f 100644
---- a/libmultipath/devmapper.c
-+++ b/libmultipath/devmapper.c
-@@ -525,36 +525,43 @@ int dm_map_present(const char * str)
- 
- int dm_get_map(const char *name, unsigned long long *size, char *outparams)
- {
--	int r = 1;
-+	int r = DMP_ERR;
- 	struct dm_task *dmt;
- 	uint64_t start, length;
- 	char *target_type = NULL;
- 	char *params = NULL;
- 
- 	if (!(dmt = libmp_dm_task_create(DM_DEVICE_TABLE)))
--		return 1;
-+		return r;
- 
- 	if (!dm_task_set_name(dmt, name))
- 		goto out;
- 
- 	dm_task_no_open_count(dmt);
- 
--	if (!dm_task_run(dmt))
-+	errno = 0;
-+	if (!dm_task_run(dmt)) {
-+		if (dm_task_get_errno(dmt) == ENXIO)
-+			r = DMP_NOT_FOUND;
- 		goto out;
-+	}
- 
-+	r = DMP_NOT_FOUND;
- 	/* Fetch 1st target */
--	dm_get_next_target(dmt, NULL, &start, &length,
--			   &target_type, &params);
-+	if (dm_get_next_target(dmt, NULL, &start, &length,
-+			       &target_type, &params) != NULL)
-+		/* more than one target */
-+		goto out;
- 
- 	if (size)
- 		*size = length;
- 
- 	if (!outparams) {
--		r = 0;
-+		r = DMP_OK;
- 		goto out;
- 	}
- 	if (snprintf(outparams, PARAMS_SIZE, "%s", params) <= PARAMS_SIZE)
--		r = 0;
-+		r = DMP_OK;
- out:
- 	dm_task_destroy(dmt);
- 	return r;
-@@ -628,35 +635,45 @@ is_mpath_part(const char *part_name, const char *map_name)
- 
- int dm_get_status(const char *name, char *outstatus)
- {
--	int r = 1;
-+	int r = DMP_ERR;
- 	struct dm_task *dmt;
- 	uint64_t start, length;
- 	char *target_type = NULL;
- 	char *status = NULL;
- 
- 	if (!(dmt = libmp_dm_task_create(DM_DEVICE_STATUS)))
--		return 1;
-+		return r;
- 
- 	if (!dm_task_set_name(dmt, name))
- 		goto out;
- 
- 	dm_task_no_open_count(dmt);
- 
--	if (!dm_task_run(dmt))
-+	errno = 0;
-+	if (!dm_task_run(dmt)) {
-+		if (dm_task_get_errno(dmt) == ENXIO)
-+			r = DMP_NOT_FOUND;
- 		goto out;
-+	}
- 
-+	r = DMP_NOT_FOUND;
- 	/* Fetch 1st target */
--	dm_get_next_target(dmt, NULL, &start, &length,
--			   &target_type, &status);
-+	if (dm_get_next_target(dmt, NULL, &start, &length,
-+			       &target_type, &status) != NULL)
-+		goto out;
-+
-+	if (!target_type || strcmp(target_type, TGT_MPATH) != 0)
-+		goto out;
-+
- 	if (!status) {
- 		condlog(2, "get null status.");
- 		goto out;
- 	}
- 
- 	if (snprintf(outstatus, PARAMS_SIZE, "%s", status) <= PARAMS_SIZE)
--		r = 0;
-+		r = DMP_OK;
- out:
--	if (r)
-+	if (r != DMP_OK)
- 		condlog(0, "%s: error getting map status string", name);
- 
- 	dm_task_destroy(dmt);
-@@ -866,7 +883,7 @@ int _dm_flush_map (const char * mapname, int need_sync, int deferred_remove,
- 			return 1;
- 
- 	if (need_suspend &&
--	    !dm_get_map(mapname, &mapsize, params) &&
-+	    dm_get_map(mapname, &mapsize, params) == DMP_OK &&
- 	    strstr(params, "queue_if_no_path")) {
- 		if (!dm_queue_if_no_path(mapname, 0))
- 			queue_if_no_path = 1;
-@@ -1075,7 +1092,7 @@ struct multipath *dm_get_multipath(const char *name)
- 	if (!mpp->alias)
- 		goto out;
- 
--	if (dm_get_map(name, &mpp->size, NULL))
-+	if (dm_get_map(name, &mpp->size, NULL) != DMP_OK)
- 		goto out;
- 
- 	dm_get_uuid(name, mpp->wwid, WWID_SIZE);
-@@ -1259,7 +1276,7 @@ do_foreach_partmaps (const char * mapname,
- 		    /*
- 		     * and we can fetch the map table from the kernel
- 		     */
--		    !dm_get_map(names->name, &size, &params[0]) &&
-+		    dm_get_map(names->name, &size, &params[0]) == DMP_OK &&
- 
- 		    /*
- 		     * and the table maps over the multipath map
-diff --git a/libmultipath/devmapper.h b/libmultipath/devmapper.h
-index 7557a86b..adb55000 100644
---- a/libmultipath/devmapper.h
-+++ b/libmultipath/devmapper.h
-@@ -27,6 +27,12 @@
- #define UUID_PREFIX "mpath-"
- #define UUID_PREFIX_LEN (sizeof(UUID_PREFIX) - 1)
- 
-+enum {
-+	DMP_ERR,
-+	DMP_OK,
-+	DMP_NOT_FOUND,
-+};
-+
- void dm_init(int verbosity);
- void libmp_dm_init(void);
- void libmp_udev_set_sync_support(int on);
-diff --git a/libmultipath/structs_vec.c b/libmultipath/structs_vec.c
-index 077f2e42..8137ea21 100644
---- a/libmultipath/structs_vec.c
-+++ b/libmultipath/structs_vec.c
-@@ -196,43 +196,47 @@ extract_hwe_from_path(struct multipath * mpp)
- int
- update_multipath_table (struct multipath *mpp, vector pathvec, int is_daemon)
- {
-+	int r = DMP_ERR;
- 	char params[PARAMS_SIZE] = {0};
- 
- 	if (!mpp)
--		return 1;
-+		return r;
- 
--	if (dm_get_map(mpp->alias, &mpp->size, params)) {
--		condlog(3, "%s: cannot get map", mpp->alias);
--		return 1;
-+	r = dm_get_map(mpp->alias, &mpp->size, params);
-+	if (r != DMP_OK) {
-+		condlog(3, "%s: %s", mpp->alias, (r == DMP_ERR)? "error getting table" : "map not present");
-+		return r;
- 	}
- 
- 	if (disassemble_map(pathvec, params, mpp, is_daemon)) {
- 		condlog(3, "%s: cannot disassemble map", mpp->alias);
--		return 1;
-+		return DMP_ERR;
- 	}
- 
--	return 0;
-+	return DMP_OK;
- }
- 
- int
- update_multipath_status (struct multipath *mpp)
- {
-+	int r = DMP_ERR;
- 	char status[PARAMS_SIZE] = {0};
- 
- 	if (!mpp)
--		return 1;
-+		return r;
- 
--	if (dm_get_status(mpp->alias, status)) {
--		condlog(3, "%s: cannot get status", mpp->alias);
--		return 1;
-+	r = dm_get_status(mpp->alias, status);
-+	if (r != DMP_OK) {
-+		condlog(3, "%s: %s", mpp->alias, (r == DMP_ERR)? "error getting status" : "map not present");
-+		return r;
- 	}
- 
- 	if (disassemble_status(status, mpp)) {
- 		condlog(3, "%s: cannot disassemble status", mpp->alias);
--		return 1;
-+		return DMP_ERR;
- 	}
- 
--	return 0;
-+	return DMP_OK;
- }
- 
- void sync_paths(struct multipath *mpp, vector pathvec)
-@@ -264,10 +268,10 @@ int
- update_multipath_strings(struct multipath *mpp, vector pathvec, int is_daemon)
- {
- 	struct pathgroup *pgp;
--	int i;
-+	int i, r = DMP_ERR;
- 
- 	if (!mpp)
--		return 1;
-+		return r;
- 
- 	update_mpp_paths(mpp, pathvec);
- 	condlog(4, "%s: %s", mpp->alias, __FUNCTION__);
-@@ -276,18 +280,21 @@ update_multipath_strings(struct multipath *mpp, vector pathvec, int is_daemon)
- 	free_pgvec(mpp->pg, KEEP_PATHS);
- 	mpp->pg = NULL;
- 
--	if (update_multipath_table(mpp, pathvec, is_daemon))
--		return 1;
-+	r = update_multipath_table(mpp, pathvec, is_daemon);
-+	if (r != DMP_OK)
-+		return r;
-+
- 	sync_paths(mpp, pathvec);
- 
--	if (update_multipath_status(mpp))
--		return 1;
-+	r = update_multipath_status(mpp);
-+	if (r != DMP_OK)
-+		return r;
- 
- 	vector_foreach_slot(mpp->pg, pgp, i)
- 		if (pgp->paths)
- 			path_group_prio_update(pgp);
- 
--	return 0;
-+	return DMP_OK;
- }
- 
- static void enter_recovery_mode(struct multipath *mpp)
-diff --git a/multipathd/main.c b/multipathd/main.c
-index 6b7db2c0..e3427d3d 100644
---- a/multipathd/main.c
-+++ b/multipathd/main.c
-@@ -414,7 +414,7 @@ int __setup_multipath(struct vectors *vecs, struct multipath *mpp,
- 		goto out;
- 	}
- 
--	if (update_multipath_strings(mpp, vecs->pathvec, 1)) {
-+	if (update_multipath_strings(mpp, vecs->pathvec, 1) != DMP_OK) {
- 		condlog(0, "%s: failed to setup multipath", mpp->alias);
- 		goto out;
- 	}
-@@ -553,9 +553,9 @@ add_map_without_path (struct vectors *vecs, const char *alias)
- 	mpp->mpe = find_mpe(conf->mptable, mpp->wwid);
- 	put_multipath_config(conf);
- 
--	if (update_multipath_table(mpp, vecs->pathvec, 1))
-+	if (update_multipath_table(mpp, vecs->pathvec, 1) != DMP_OK)
- 		goto out;
--	if (update_multipath_status(mpp))
-+	if (update_multipath_status(mpp) != DMP_OK)
- 		goto out;
- 
- 	if (!vector_alloc_slot(vecs->mpvec))
-@@ -1346,8 +1346,8 @@ map_discovery (struct vectors * vecs)
- 		return 1;
- 
- 	vector_foreach_slot (vecs->mpvec, mpp, i)
--		if (update_multipath_table(mpp, vecs->pathvec, 1) ||
--		    update_multipath_status(mpp)) {
-+		if (update_multipath_table(mpp, vecs->pathvec, 1) != DMP_OK ||
-+		    update_multipath_status(mpp) != DMP_OK) {
- 			remove_map(mpp, vecs, 1);
- 			i--;
- 		}
-@@ -2087,7 +2087,7 @@ check_path (struct vectors * vecs, struct path * pp, unsigned int ticks)
- 	/*
- 	 * Synchronize with kernel state
- 	 */
--	if (update_multipath_strings(pp->mpp, vecs->pathvec, 1)) {
-+	if (update_multipath_strings(pp->mpp, vecs->pathvec, 1) != DMP_OK) {
- 		condlog(1, "%s: Could not synchronize with kernel state",
- 			pp->dev);
- 		pp->dmstate = PSTATE_UNDEF;
--- 
-2.17.2
-

SOURCES/0024-libmultipath-use-typedef-for-keyword-handler-functio.patch

@@ -1,44 +1,39 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Thu, 23 Sep 2021 21:39:36 -0500
-Subject: [PATCH] libmultipath: use typedef for keyword handler and print
+Subject: [PATCH] libmultipath: use typedef for keyword handler function
- functions
 
 Don't keep writing out the function type.
 
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
- libmultipath/parser.c | 10 +++++-----
+ libmultipath/parser.c |  6 +++---
- libmultipath/parser.h | 25 ++++++++++++-------------
+ libmultipath/parser.h | 15 ++++++---------
- 2 files changed, 17 insertions(+), 18 deletions(-)
+ 2 files changed, 9 insertions(+), 12 deletions(-)
 
 diff --git a/libmultipath/parser.c b/libmultipath/parser.c
-index 96b95936..e511acf9 100644
+index 611054f7..ebe1cbd9 100644
 --- a/libmultipath/parser.c
 +++ b/libmultipath/parser.c
-@@ -32,8 +32,8 @@ static int line_nr;
+@@ -33,7 +33,7 @@ static int line_nr;
  
  int
  keyword_alloc(vector keywords, char *string,
 -	      int (*handler) (struct config *, vector),
--	      int (*print) (struct config *, char *, int, const void*),
 +	      handler_fn *handler,
-+	      print_fn *print,
+ 	      print_fn *print,
  	      int unique)
  {
- 	struct keyword *keyword;
+@@ -72,7 +72,7 @@ install_sublevel_end(void)
-@@ -71,8 +71,8 @@ install_sublevel_end(void)
  
  int
  _install_keyword(vector keywords, char *string,
 -		 int (*handler) (struct config *, vector),
--		 int (*print) (struct config *, char *, int, const void*),
 +		 handler_fn *handler,
-+		 print_fn *print,
+ 		 print_fn *print,
  		 int unique)
  {
- 	int i = 0;
+@@ -558,7 +558,7 @@ process_stream(struct config *conf, FILE *stream, vector keywords,
-@@ -562,7 +562,7 @@ process_stream(struct config *conf, FILE *stream, vector keywords,
  						goto out;
  				}
  				if (keyword->handler) {
@@ -48,48 +43,40 @@ index 96b95936..e511acf9 100644
  					if (t)
  						condlog(1, "multipath.conf +%d, parsing failed: %s",
 diff --git a/libmultipath/parser.h b/libmultipath/parser.h
-index b7917052..e8d89607 100644
+index b43d46f8..3452bde1 100644
 --- a/libmultipath/parser.h
 +++ b/libmultipath/parser.h
-@@ -39,11 +39,15 @@
+@@ -43,10 +43,11 @@ struct strbuf;
- #define EOB  "}"
- #define MAXBUF	1024
  
--/* ketword definition */
+ /* keyword definition */
-+
+ typedef int print_fn(struct config *, struct strbuf *, const void *);
-+/* keyword definition */
-+typedef int print_fn(struct config *, char *, int, const void *);
 +typedef int handler_fn(struct config *, vector);
-+
+ 
  struct keyword {
  	char *string;
 -	int (*handler) (struct config *, vector);
--	int (*print) (struct config *, char *, int, const void *);
 +	handler_fn *handler;
-+	print_fn *print;
+ 	print_fn *print;
  	vector sub;
  	int unique;
- };
+@@ -62,18 +63,14 @@ struct keyword {
-@@ -58,19 +62,14 @@ struct keyword {
  	for (i = 0; i < (k)->sub->allocated && ((p) = (k)->sub->slot[i]); i++)
  
  /* Prototypes */
 -extern int keyword_alloc(vector keywords, char *string,
 -			 int (*handler) (struct config *, vector),
--			 int (*print) (struct config *, char *, int,
+-			 print_fn *print,
--				       const void *),
 -			 int unique);
 +extern int keyword_alloc(vector keywords, char *string, handler_fn *handler,
 +			 print_fn *print, int unique);
  #define install_keyword_root(str, h) keyword_alloc(keywords, str, h, NULL, 1)
  extern void install_sublevel(void);
  extern void install_sublevel_end(void);
+ 
 -extern int _install_keyword(vector keywords, char *string,
 -			    int (*handler) (struct config *, vector),
--			    int (*print) (struct config *, char *, int,
+-			    print_fn *print,
--					  const void *),
 -			    int unique);
-+
 +extern int _install_keyword(vector keywords, char *string, handler_fn *handler,
 +			    print_fn *print, int unique);
  #define install_keyword(str, vec, pri) _install_keyword(keywords, str, vec, pri, 1)

SOURCES/0025-libmultipath-print-the-correct-file-when-parsing-fai.patch

@@ -11,10 +11,10 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/libmultipath/parser.c b/libmultipath/parser.c
-index e511acf9..341f2b80 100644
+index ebe1cbd9..d5595fb0 100644
 --- a/libmultipath/parser.c
 +++ b/libmultipath/parser.c
-@@ -565,8 +565,8 @@ process_stream(struct config *conf, FILE *stream, vector keywords,
+@@ -561,8 +561,8 @@ process_stream(struct config *conf, FILE *stream, vector keywords,
  				    t = keyword->handler(conf, strvec);
  					r += t;
  					if (t)

SOURCES/0025-multipathd-fix-check_path-errors-with-removed-map.patch

@@ -1,116 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Thu, 11 Jun 2020 15:41:18 -0500
-Subject: [PATCH] multipathd: fix check_path errors with removed map
-
-If a multipath device is removed during, or immediately before the call
-to check_path(), multipathd can behave incorrectly. A missing multpath
-device will cause update_multipath_strings() to fail, setting
-pp->dmstate to PSTATE_UNDEF.  If the path is up, this state will cause
-reinstate_path() to be called, which will also fail.  This will trigger
-a reload, restoring the recently removed device.
-
-If update_multipath_strings() fails because there is no multipath
-device, check_path should just quit, since the remove dmevent and uevent
-are likely already queued up. Also, I don't see any reason to reload the
-multipath device if reinstate fails. This code was added by
-fac68d7a99ef17d496079538a5c6836acd7911ab, which clamined that reinstate
-could fail if the path was disabled.  Looking through the current kernel
-code, I can't see any reason why a reinstate would fail, where a reload
-would help. If the path was missing from the multipath device,
-update_multipath_strings() would already catch that, and quit
-check_path() early, which make more sense to me than reloading does.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- multipathd/main.c | 44 +++++++++++++++++++-------------------------
- 1 file changed, 19 insertions(+), 25 deletions(-)
-
-diff --git a/multipathd/main.c b/multipathd/main.c
-index e3427d3d..1d9ce7f7 100644
---- a/multipathd/main.c
-+++ b/multipathd/main.c
-@@ -1611,22 +1611,18 @@ fail_path (struct path * pp, int del_active)
- /*
-  * caller must have locked the path list before calling that function
-  */
--static int
-+static void
- reinstate_path (struct path * pp)
- {
--	int ret = 0;
--
- 	if (!pp->mpp)
--		return 0;
-+		return;
- 
--	if (dm_reinstate_path(pp->mpp->alias, pp->dev_t)) {
-+	if (dm_reinstate_path(pp->mpp->alias, pp->dev_t))
- 		condlog(0, "%s: reinstate failed", pp->dev_t);
--		ret = 1;
--	} else {
-+	else {
- 		condlog(2, "%s: reinstated", pp->dev_t);
- 		update_queue_mode_add_path(pp->mpp);
- 	}
--	return ret;
- }
- 
- static void
-@@ -2087,9 +2083,16 @@ check_path (struct vectors * vecs, struct path * pp, unsigned int ticks)
- 	/*
- 	 * Synchronize with kernel state
- 	 */
--	if (update_multipath_strings(pp->mpp, vecs->pathvec, 1) != DMP_OK) {
--		condlog(1, "%s: Could not synchronize with kernel state",
--			pp->dev);
-+	ret = update_multipath_strings(pp->mpp, vecs->pathvec, 1);
-+	if (ret != DMP_OK) {
-+		if (ret == DMP_NOT_FOUND) {
-+			/* multipath device missing. Likely removed */
-+			condlog(1, "%s: multipath device '%s' not found",
-+				pp->dev, pp->mpp->alias);
-+			return 0;
-+		} else
-+			condlog(1, "%s: Couldn't synchronize with kernel state",
-+				pp->dev);
- 		pp->dmstate = PSTATE_UNDEF;
- 	}
- 	/* if update_multipath_strings orphaned the path, quit early */
-@@ -2179,12 +2182,8 @@ check_path (struct vectors * vecs, struct path * pp, unsigned int ticks)
- 		/*
- 		 * reinstate this path
- 		 */
--		if (!disable_reinstate && reinstate_path(pp)) {
--			condlog(3, "%s: reload map", pp->dev);
--			ev_add_path(pp, vecs, 1);
--			pp->tick = 1;
--			return 0;
--		}
-+		if (!disable_reinstate)
-+			reinstate_path(pp);
- 		new_path_up = 1;
- 
- 		if (oldchkrstate != PATH_UP && oldchkrstate != PATH_GHOST)
-@@ -2200,15 +2199,10 @@ check_path (struct vectors * vecs, struct path * pp, unsigned int ticks)
- 	else if (newstate == PATH_UP || newstate == PATH_GHOST) {
- 		if ((pp->dmstate == PSTATE_FAILED ||
- 		    pp->dmstate == PSTATE_UNDEF) &&
--		    !disable_reinstate) {
-+		    !disable_reinstate)
- 			/* Clear IO errors */
--			if (reinstate_path(pp)) {
--				condlog(3, "%s: reload map", pp->dev);
--				ev_add_path(pp, vecs, 1);
--				pp->tick = 1;
--				return 0;
--			}
--		} else {
-+			reinstate_path(pp);
-+		else {
- 			LOG_MSG(4, verbosity, pp);
- 			if (pp->checkint != max_checkint) {
- 				/*
--- 
-2.17.2
-

SOURCES/0026-libmultipath-make-dm_flush_maps-only-return-0-on-suc.patch

@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Wed, 17 Jun 2020 13:31:37 -0500
-Subject: [PATCH] libmultipath: make dm_flush_maps only return 0 on success
-
-dm_flush_maps() returned both 0 and 1 on error, depending on which part
-of the function it was in, but the caller was always treating 0 as a
-success. Make dm_flush_maps() always return 1 on error and 0 on success.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/devmapper.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
-index f6204e5f..cda83ce4 100644
---- a/libmultipath/devmapper.c
-+++ b/libmultipath/devmapper.c
-@@ -953,13 +953,13 @@ dm_flush_map_nopaths(const char * mapname, int deferred_remove)
- 
- int dm_flush_maps (int retries)
- {
--	int r = 0;
-+	int r = 1;
- 	struct dm_task *dmt;
- 	struct dm_names *names;
- 	unsigned next = 0;
- 
- 	if (!(dmt = libmp_dm_task_create (DM_DEVICE_LIST)))
--		return 0;
-+		return r;
- 
- 	dm_task_no_open_count(dmt);
- 
-@@ -972,6 +972,7 @@ int dm_flush_maps (int retries)
- 	if (!names->dev)
- 		goto out;
- 
-+	r = 0;
- 	do {
- 		r |= dm_suspend_and_flush_map(names->name, retries);
- 		next = names->next;
--- 
-2.17.2
-

SOURCES/0026-libmultipath-pass-file-and-line-number-to-keyword-ha.patch

@@ -8,17 +8,17 @@ warning messages. It will be used by future patches.
 
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
- libmultipath/dict.c   | 145 +++++++++++++++++++++++++-----------------
+ libmultipath/dict.c   | 143 +++++++++++++++++++++++++-----------------
  libmultipath/parser.c |   3 +-
  libmultipath/parser.h |   2 +-
- 3 files changed, 91 insertions(+), 59 deletions(-)
+ 3 files changed, 90 insertions(+), 58 deletions(-)
 
 diff --git a/libmultipath/dict.c b/libmultipath/dict.c
-index 13698b76..a8872da7 100644
+index 7a727389..eb2c44c0 100644
 --- a/libmultipath/dict.c
 +++ b/libmultipath/dict.c
-@@ -28,7 +28,7 @@
+@@ -29,7 +29,7 @@
- #include "dict.h"
+ #include "strbuf.h"
  
  static int
 -set_int(vector strvec, void *ptr)
@@ -26,7 +26,7 @@ index 13698b76..a8872da7 100644
  {
  	int *int_ptr = (int *)ptr;
  	char *buff, *eptr;
-@@ -57,7 +57,7 @@ set_int(vector strvec, void *ptr)
+@@ -58,7 +58,7 @@ set_int(vector strvec, void *ptr)
  }
  
  static int
@@ -35,7 +35,7 @@ index 13698b76..a8872da7 100644
  {
  	unsigned int *uint_ptr = (unsigned int *)ptr;
  	char *buff, *eptr, *p;
-@@ -89,7 +89,7 @@ set_uint(vector strvec, void *ptr)
+@@ -90,7 +90,7 @@ set_uint(vector strvec, void *ptr)
  }
  
  static int
@@ -44,16 +44,7 @@ index 13698b76..a8872da7 100644
  {
  	char **str_ptr = (char **)ptr;
  
-@@ -104,7 +104,7 @@ set_str(vector strvec, void *ptr)
+@@ -105,7 +105,7 @@ set_str(vector strvec, void *ptr)
- }
- 
- static int
--set_regex(vector strvec, void *ptr)
-+set_regex(vector strvec, void *ptr, const char *file, int line_nr)
- {
- 	char **str_ptr = (char **)ptr;
- 
-@@ -119,7 +119,7 @@ set_regex(vector strvec, void *ptr)
  }
  
  static int
@@ -62,7 +53,7 @@ index 13698b76..a8872da7 100644
  {
  	char * buff;
  	int *int_ptr = (int *)ptr;
-@@ -138,7 +138,7 @@ set_yes_no(vector strvec, void *ptr)
+@@ -124,7 +124,7 @@ set_yes_no(vector strvec, void *ptr)
  }
  
  static int
@@ -71,7 +62,7 @@ index 13698b76..a8872da7 100644
  {
  	char * buff;
  	int *int_ptr = (int *)ptr;
-@@ -240,9 +240,10 @@ print_yes_no_undef (char *buff, int len, long v)
+@@ -187,9 +187,10 @@ static int print_yes_no_undef(struct strbuf *buff, long v)
  
  #define declare_def_handler(option, function)				\
  static int								\
@@ -84,7 +75,7 @@ index 13698b76..a8872da7 100644
  }
  
  #define declare_def_snprint(option, function)				\
-@@ -277,12 +278,13 @@ snprint_def_ ## option (struct config *conf, char * buff, int len,	\
+@@ -224,12 +225,13 @@ snprint_def_ ## option (struct config *conf, struct strbuf *buff,	\
  
  #define declare_hw_handler(option, function)				\
  static int								\
@@ -100,7 +91,7 @@ index 13698b76..a8872da7 100644
  }
  
  #define declare_hw_snprint(option, function)				\
-@@ -296,11 +298,12 @@ snprint_hw_ ## option (struct config *conf, char * buff, int len,	\
+@@ -243,11 +245,12 @@ snprint_hw_ ## option (struct config *conf, struct strbuf *buff,	\
  
  #define declare_ovr_handler(option, function)				\
  static int								\
@@ -115,7 +106,7 @@ index 13698b76..a8872da7 100644
  }
  
  #define declare_ovr_snprint(option, function)				\
-@@ -313,12 +316,13 @@ snprint_ovr_ ## option (struct config *conf, char * buff, int len,	\
+@@ -260,12 +263,13 @@ snprint_ovr_ ## option (struct config *conf, struct strbuf *buff,	\
  
  #define declare_mp_handler(option, function)				\
  static int								\
@@ -131,8 +122,8 @@ index 13698b76..a8872da7 100644
  }
  
  #define declare_mp_snprint(option, function)				\
-@@ -330,9 +334,10 @@ snprint_mp_ ## option (struct config *conf, char * buff, int len,	\
+@@ -277,9 +281,10 @@ snprint_mp_ ## option (struct config *conf, struct strbuf *buff,	\
- 	return function (buff, len, mpe->option);			\
+ 	return function(buff, mpe->option);				\
  }
  
 -static int checkint_handler(struct config *conf, vector strvec)
@@ -144,7 +135,7 @@ index 13698b76..a8872da7 100644
  
  	if (rc)
  		return rc;
-@@ -355,9 +360,10 @@ declare_def_snprint(reassign_maps, print_yes_no)
+@@ -302,9 +307,10 @@ declare_def_snprint(reassign_maps, print_yes_no)
  declare_def_handler(multipath_dir, set_str)
  declare_def_snprint(multipath_dir, print_str)
  
@@ -157,7 +148,7 @@ index 13698b76..a8872da7 100644
  
  	if (rc != 0)
  		return rc;
-@@ -387,13 +393,13 @@ static const char * const find_multipaths_optvals[] = {
+@@ -334,13 +340,13 @@ static const char * const find_multipaths_optvals[] = {
  };
  
  static int
@@ -174,8 +165,8 @@ index 13698b76..a8872da7 100644
  		return 0;
  
  	buff = set_value(strvec);
-@@ -451,7 +457,8 @@ static int snprint_uid_attrs(struct config *conf, char *buff, int len,
+@@ -396,7 +402,8 @@ static int snprint_uid_attrs(struct config *conf, struct strbuf *buff,
- 	return p - buff;
+ 	return total;
  }
  
 -static int uid_attrs_handler(struct config *conf, vector strvec)
@@ -184,7 +175,7 @@ index 13698b76..a8872da7 100644
  {
  	char *val;
  
-@@ -644,7 +651,8 @@ declare_hw_handler(skip_kpartx, set_yes_no_undef)
+@@ -597,7 +604,8 @@ declare_hw_handler(skip_kpartx, set_yes_no_undef)
  declare_hw_snprint(skip_kpartx, print_yes_no_undef)
  declare_mp_handler(skip_kpartx, set_yes_no_undef)
  declare_mp_snprint(skip_kpartx, print_yes_no_undef)
@@ -194,7 +185,7 @@ index 13698b76..a8872da7 100644
  {
  	return 0;
  }
-@@ -675,20 +683,23 @@ declare_def_snprint_defstr(enable_foreign, print_str,
+@@ -629,20 +637,23 @@ declare_def_snprint_defstr(enable_foreign, print_str,
  			   DEFAULT_ENABLE_FOREIGN)
  
  static int
@@ -222,7 +213,7 @@ index 13698b76..a8872da7 100644
  }
  
  #define declare_def_attr_snprint(option, function)			\
-@@ -702,12 +713,14 @@ snprint_def_ ## option (struct config *conf, char * buff, int len,	\
+@@ -655,12 +666,14 @@ snprint_def_ ## option (struct config *conf, struct strbuf *buff,	\
  
  #define declare_mp_attr_handler(option, function)			\
  static int								\
@@ -239,7 +230,7 @@ index 13698b76..a8872da7 100644
  }
  
  #define declare_mp_attr_snprint(option, function)			\
-@@ -721,7 +734,7 @@ snprint_mp_ ## option (struct config *conf, char * buff, int len,	\
+@@ -673,7 +686,7 @@ snprint_mp_ ## option (struct config *conf, struct strbuf *buff,	\
  }
  
  static int
@@ -248,7 +239,7 @@ index 13698b76..a8872da7 100644
  {
  	mode_t mode;
  	mode_t *mode_ptr = (mode_t *)ptr;
-@@ -742,7 +755,7 @@ set_mode(vector strvec, void *ptr, int *flags)
+@@ -694,7 +707,7 @@ set_mode(vector strvec, void *ptr, int *flags)
  }
  
  static int
@@ -257,7 +248,7 @@ index 13698b76..a8872da7 100644
  {
  	uid_t uid;
  	uid_t *uid_ptr = (uid_t *)ptr;
-@@ -767,7 +780,7 @@ set_uid(vector strvec, void *ptr, int *flags)
+@@ -719,7 +732,7 @@ set_uid(vector strvec, void *ptr, int *flags)
  }
  
  static int
@@ -266,7 +257,7 @@ index 13698b76..a8872da7 100644
  {
  	gid_t gid;
  	gid_t *gid_ptr = (gid_t *)ptr;
-@@ -834,7 +847,7 @@ declare_mp_attr_handler(gid, set_gid)
+@@ -786,7 +799,7 @@ declare_mp_attr_handler(gid, set_gid)
  declare_mp_attr_snprint(gid, print_gid)
  
  static int
@@ -275,7 +266,7 @@ index 13698b76..a8872da7 100644
  {
  	char * buff;
  	int *int_ptr = (int *)ptr;
-@@ -876,7 +889,7 @@ declare_hw_handler(fast_io_fail, set_undef_off_zero)
+@@ -827,7 +840,7 @@ declare_hw_handler(fast_io_fail, set_undef_off_zero)
  declare_hw_snprint(fast_io_fail, print_undef_off_zero)
  
  static int
@@ -284,7 +275,7 @@ index 13698b76..a8872da7 100644
  {
  	char * buff;
  	unsigned int *uint_ptr = (unsigned int *)ptr;
-@@ -919,7 +932,7 @@ declare_hw_handler(eh_deadline, set_undef_off_zero)
+@@ -870,7 +883,7 @@ declare_hw_handler(eh_deadline, set_undef_off_zero)
  declare_hw_snprint(eh_deadline, print_undef_off_zero)
  
  static int
@@ -293,7 +284,7 @@ index 13698b76..a8872da7 100644
  {
  	char * buff;
  	int *int_ptr = (int *)ptr;
-@@ -985,7 +998,8 @@ get_sys_max_fds(int *max_fds)
+@@ -936,7 +949,8 @@ get_sys_max_fds(int *max_fds)
  
  
  static int
@@ -303,7 +294,7 @@ index 13698b76..a8872da7 100644
  {
  	char * buff;
  	int r = 0, max_fds;
-@@ -1030,7 +1044,7 @@ snprint_max_fds (struct config *conf, char * buff, int len, const void * data)
+@@ -981,7 +995,7 @@ snprint_max_fds (struct config *conf, struct strbuf *buff, const void *data)
  }
  
  static int
@@ -312,7 +303,7 @@ index 13698b76..a8872da7 100644
  {
  	int *int_ptr = (int *)ptr;
  	char * buff;
-@@ -1074,7 +1088,7 @@ declare_mp_handler(rr_weight, set_rr_weight)
+@@ -1025,7 +1039,7 @@ declare_mp_handler(rr_weight, set_rr_weight)
  declare_mp_snprint(rr_weight, print_rr_weight)
  
  static int
@@ -321,7 +312,7 @@ index 13698b76..a8872da7 100644
  {
  	int *int_ptr = (int *)ptr;
  	char * buff;
-@@ -1124,7 +1138,7 @@ declare_mp_handler(pgfailback, set_pgfailback)
+@@ -1075,7 +1089,7 @@ declare_mp_handler(pgfailback, set_pgfailback)
  declare_mp_snprint(pgfailback, print_pgfailback)
  
  static int
@@ -330,7 +321,7 @@ index 13698b76..a8872da7 100644
  {
  	int *int_ptr = (int *)ptr;
  	char * buff;
-@@ -1169,7 +1183,8 @@ declare_mp_handler(no_path_retry, no_path_retry_helper)
+@@ -1120,7 +1134,8 @@ declare_mp_handler(no_path_retry, no_path_retry_helper)
  declare_mp_snprint(no_path_retry, print_no_path_retry)
  
  static int
@@ -340,7 +331,7 @@ index 13698b76..a8872da7 100644
  {
  	char * buff;
  
-@@ -1243,7 +1258,8 @@ print_reservation_key(char * buff, int len, struct be64 key, uint8_t flags,
+@@ -1193,7 +1208,8 @@ print_reservation_key(struct strbuf *buff,
  }
  
  static int
@@ -350,7 +341,7 @@ index 13698b76..a8872da7 100644
  {
  	return set_reservation_key(strvec, &conf->reservation_key,
  				   &conf->sa_flags,
-@@ -1260,7 +1276,8 @@ snprint_def_reservation_key (struct config *conf, char * buff, int len,
+@@ -1209,7 +1225,8 @@ snprint_def_reservation_key (struct config *conf, struct strbuf *buff,
  }
  
  static int
@@ -360,7 +351,7 @@ index 13698b76..a8872da7 100644
  {
  	struct mpentry * mpe = VECTOR_LAST_SLOT(conf->mptable);
  	if (!mpe)
-@@ -1281,7 +1298,7 @@ snprint_mp_reservation_key (struct config *conf, char * buff, int len,
+@@ -1229,7 +1246,7 @@ snprint_mp_reservation_key (struct config *conf, struct strbuf *buff,
  }
  
  static int
@@ -369,7 +360,7 @@ index 13698b76..a8872da7 100644
  {
  	int *int_ptr = (int *)ptr;
  	char * buff;
-@@ -1422,7 +1439,8 @@ declare_hw_snprint(recheck_wwid, print_yes_no_undef)
+@@ -1370,7 +1387,8 @@ declare_hw_snprint(recheck_wwid, print_yes_no_undef)
  
  
  static int
@@ -379,7 +370,7 @@ index 13698b76..a8872da7 100644
  {
  	unsigned int uxsock_timeout;
  	char *buff;
-@@ -1442,7 +1460,8 @@ def_uxsock_timeout_handler(struct config *conf, vector strvec)
+@@ -1390,7 +1408,8 @@ def_uxsock_timeout_handler(struct config *conf, vector strvec)
  }
  
  static int
@@ -389,7 +380,7 @@ index 13698b76..a8872da7 100644
  {
  	int i;
  	char *buff;
-@@ -1482,7 +1501,8 @@ snprint_hw_vpd_vendor(struct config *conf, char * buff, int len,
+@@ -1430,7 +1449,8 @@ snprint_hw_vpd_vendor(struct config *conf, struct strbuf *buff,
   * blacklist block handlers
   */
  static int
@@ -399,7 +390,7 @@ index 13698b76..a8872da7 100644
  {
  	if (!conf->blist_devnode)
  		conf->blist_devnode = vector_alloc();
-@@ -1504,7 +1524,8 @@ blacklist_handler(struct config *conf, vector strvec)
+@@ -1452,7 +1472,8 @@ blacklist_handler(struct config *conf, vector strvec)
  }
  
  static int
@@ -409,7 +400,7 @@ index 13698b76..a8872da7 100644
  {
  	if (!conf->elist_devnode)
  		conf->elist_devnode = vector_alloc();
-@@ -1527,7 +1548,8 @@ blacklist_exceptions_handler(struct config *conf, vector strvec)
+@@ -1475,7 +1496,8 @@ blacklist_exceptions_handler(struct config *conf, vector strvec)
  
  #define declare_ble_handler(option)					\
  static int								\
@@ -418,8 +409,8 @@ index 13698b76..a8872da7 100644
 +			    const char *file, int line_nr)		\
  {									\
  	char *buff;							\
- 									\
+ 	int rc;								\
-@@ -1543,7 +1565,8 @@ ble_ ## option ## _handler (struct config *conf, vector strvec)		\
+@@ -1494,7 +1516,8 @@ ble_ ## option ## _handler (struct config *conf, vector strvec)		\
  
  #define declare_ble_device_handler(name, option, vend, prod)		\
  static int								\
@@ -428,8 +419,8 @@ index 13698b76..a8872da7 100644
 +					 const char *file, int line_nr)	\
  {									\
  	char * buff;							\
- 									\
+ 	int rc;								\
-@@ -1583,13 +1606,15 @@ snprint_ble_simple (struct config *conf, char * buff, int len,
+@@ -1536,13 +1559,15 @@ snprint_ble_simple (struct config *conf, struct strbuf *buff, const void *data)
  }
  
  static int
@@ -447,7 +438,7 @@ index 13698b76..a8872da7 100644
  {
  	return alloc_ble_device(conf->elist_device);
  }
-@@ -1623,7 +1648,8 @@ snprint_bled_product (struct config *conf, char * buff, int len,
+@@ -1574,7 +1599,8 @@ static int snprint_bled_product(struct config *conf, struct strbuf *buff,
   * devices block handlers
   */
  static int
@@ -457,7 +448,7 @@ index 13698b76..a8872da7 100644
  {
  	if (!conf->hwtable)
  		conf->hwtable = vector_alloc();
-@@ -1635,7 +1661,8 @@ devices_handler(struct config *conf, vector strvec)
+@@ -1586,7 +1612,8 @@ devices_handler(struct config *conf, vector strvec)
  }
  
  static int
@@ -467,7 +458,7 @@ index 13698b76..a8872da7 100644
  {
  	struct hwentry * hwe;
  
-@@ -1672,7 +1699,8 @@ declare_hw_snprint(hwhandler, print_str)
+@@ -1623,7 +1650,8 @@ declare_hw_snprint(hwhandler, print_str)
   * overrides handlers
   */
  static int
@@ -477,7 +468,7 @@ index 13698b76..a8872da7 100644
  {
  	if (!conf->overrides)
  		conf->overrides = alloc_hwe();
-@@ -1689,7 +1717,8 @@ overrides_handler(struct config *conf, vector strvec)
+@@ -1640,7 +1668,8 @@ overrides_handler(struct config *conf, vector strvec)
   * multipaths block handlers
   */
  static int
@@ -487,7 +478,7 @@ index 13698b76..a8872da7 100644
  {
  	if (!conf->mptable)
  		conf->mptable = vector_alloc();
-@@ -1701,7 +1730,8 @@ multipaths_handler(struct config *conf, vector strvec)
+@@ -1652,7 +1681,8 @@ multipaths_handler(struct config *conf, vector strvec)
  }
  
  static int
@@ -497,7 +488,7 @@ index 13698b76..a8872da7 100644
  {
  	struct mpentry * mpe;
  
-@@ -1730,7 +1760,8 @@ declare_mp_snprint(alias, print_str)
+@@ -1681,7 +1711,8 @@ declare_mp_snprint(alias, print_str)
   */
  
  static int
@@ -508,10 +499,10 @@ index 13698b76..a8872da7 100644
  	char * buff;
  
 diff --git a/libmultipath/parser.c b/libmultipath/parser.c
-index 341f2b80..29e8cee0 100644
+index d5595fb0..68262d0e 100644
 --- a/libmultipath/parser.c
 +++ b/libmultipath/parser.c
-@@ -562,7 +562,8 @@ process_stream(struct config *conf, FILE *stream, vector keywords,
+@@ -558,7 +558,8 @@ process_stream(struct config *conf, FILE *stream, vector keywords,
  						goto out;
  				}
  				if (keyword->handler) {
@@ -522,13 +513,13 @@ index 341f2b80..29e8cee0 100644
  					if (t)
  						condlog(1, "%s line %d, parsing failed: %s",
 diff --git a/libmultipath/parser.h b/libmultipath/parser.h
-index e8d89607..8b424b7a 100644
+index 3452bde1..11ea2278 100644
 --- a/libmultipath/parser.h
 +++ b/libmultipath/parser.h
-@@ -42,7 +42,7 @@
+@@ -43,7 +43,7 @@ struct strbuf;
  
  /* keyword definition */
- typedef int print_fn(struct config *, char *, int, const void *);
+ typedef int print_fn(struct config *, struct strbuf *, const void *);
 -typedef int handler_fn(struct config *, vector);
 +typedef int handler_fn(struct config *, vector, const char *file, int line_nr);
  

SOURCES/0027-libmultipath-make-set_int-take-a-range-for-valid-val.patch

@@ -12,11 +12,11 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  1 file changed, 75 insertions(+), 46 deletions(-)
 
 diff --git a/libmultipath/dict.c b/libmultipath/dict.c
-index a8872da7..686f4d5c 100644
+index eb2c44c0..57b6a7b6 100644
 --- a/libmultipath/dict.c
 +++ b/libmultipath/dict.c
-@@ -28,7 +28,8 @@
+@@ -29,7 +29,8 @@
- #include "dict.h"
+ #include "strbuf.h"
  
  static int
 -set_int(vector strvec, void *ptr, const char *file, int line_nr)
@@ -25,7 +25,7 @@ index a8872da7..686f4d5c 100644
  {
  	int *int_ptr = (int *)ptr;
  	char *buff, *eptr;
-@@ -43,11 +44,17 @@ set_int(vector strvec, void *ptr, const char *file, int line_nr)
+@@ -44,11 +45,17 @@ set_int(vector strvec, void *ptr, const char *file, int line_nr)
  	if (eptr > buff)
  		while (isspace(*eptr))
  			eptr++;
@@ -46,7 +46,7 @@ index a8872da7..686f4d5c 100644
  		rc = 0;
  		*int_ptr = res;
  	}
-@@ -76,8 +83,8 @@ set_uint(vector strvec, void *ptr, const char *file, int line_nr)
+@@ -77,8 +84,8 @@ set_uint(vector strvec, void *ptr, const char *file, int line_nr)
  		while (isspace(*eptr))
  			eptr++;
  	if (*buff == '\0' || *eptr != '\0' || !isdigit(*p) || res > UINT_MAX) {
@@ -57,7 +57,7 @@ index a8872da7..686f4d5c 100644
  		rc = 1;
  	} else {
  		rc = 0;
-@@ -246,6 +253,14 @@ def_ ## option ## _handler (struct config *conf, vector strvec,		\
+@@ -193,6 +200,14 @@ def_ ## option ## _handler (struct config *conf, vector strvec,		\
  	return function (strvec, &conf->option, file, line_nr);		\
  }
  
@@ -71,8 +71,8 @@ index a8872da7..686f4d5c 100644
 +
  #define declare_def_snprint(option, function)				\
  static int								\
- snprint_def_ ## option (struct config *conf, char * buff, int len,	\
+ snprint_def_ ## option (struct config *conf, struct strbuf *buff,	\
-@@ -287,6 +302,18 @@ hw_ ## option ## _handler (struct config *conf, vector strvec,		\
+@@ -234,6 +249,18 @@ hw_ ## option ## _handler (struct config *conf, vector strvec,		\
  	return function (strvec, &hwe->option, file, line_nr);		\
  }
  
@@ -90,8 +90,8 @@ index a8872da7..686f4d5c 100644
 +
  #define declare_hw_snprint(option, function)				\
  static int								\
- snprint_hw_ ## option (struct config *conf, char * buff, int len,	\
+ snprint_hw_ ## option (struct config *conf, struct strbuf *buff,	\
-@@ -306,6 +333,17 @@ ovr_ ## option ## _handler (struct config *conf, vector strvec,		\
+@@ -253,6 +280,17 @@ ovr_ ## option ## _handler (struct config *conf, vector strvec,		\
  	return function (strvec, &conf->overrides->option, file, line_nr); \
  }
  
@@ -108,8 +108,8 @@ index a8872da7..686f4d5c 100644
 +
  #define declare_ovr_snprint(option, function)				\
  static int								\
- snprint_ovr_ ## option (struct config *conf, char * buff, int len,	\
+ snprint_ovr_ ## option (struct config *conf, struct strbuf *buff,	\
-@@ -325,6 +363,17 @@ mp_ ## option ## _handler (struct config *conf, vector strvec,		\
+@@ -272,6 +310,17 @@ mp_ ## option ## _handler (struct config *conf, vector strvec,		\
  	return function (strvec, &mpe->option, file, line_nr);		\
  }
  
@@ -126,8 +126,8 @@ index a8872da7..686f4d5c 100644
 +
  #define declare_mp_snprint(option, function)				\
  static int								\
- snprint_mp_ ## option (struct config *conf, char * buff, int len,	\
+ snprint_mp_ ## option (struct config *conf, struct strbuf *buff,	\
-@@ -351,7 +400,7 @@ declare_def_snprint(checkint, print_int)
+@@ -298,7 +347,7 @@ declare_def_snprint(checkint, print_int)
  declare_def_handler(max_checkint, set_uint)
  declare_def_snprint(max_checkint, print_int)
  
@@ -136,7 +136,7 @@ index a8872da7..686f4d5c 100644
  declare_def_snprint(verbosity, print_int)
  
  declare_def_handler(reassign_maps, set_yes_no)
-@@ -528,22 +577,22 @@ declare_ovr_snprint(checker_name, print_str)
+@@ -473,22 +522,22 @@ declare_ovr_snprint(checker_name, print_str)
  declare_hw_handler(checker_name, set_str)
  declare_hw_snprint(checker_name, print_str)
  
@@ -167,16 +167,16 @@ index a8872da7..686f4d5c 100644
  declare_mp_snprint(minio_rq, print_nonzero)
  
  declare_def_handler(queue_without_daemon, set_yes_no)
-@@ -562,7 +611,7 @@ snprint_def_queue_without_daemon (struct config *conf,
+@@ -512,7 +561,7 @@ snprint_def_queue_without_daemon(struct config *conf, struct strbuf *buff,
- 	return 0;
+ 	return append_strbuf_quoted(buff, qwd);
  }
  
 -declare_def_handler(checker_timeout, set_int)
 +declare_def_range_handler(checker_timeout, 0, INT_MAX)
  declare_def_snprint(checker_timeout, print_nonzero)
  
- declare_def_handler(flush_on_last_del, set_yes_no_undef)
+ declare_def_handler(allow_usb_devices, set_yes_no)
-@@ -630,13 +679,13 @@ declare_hw_snprint(deferred_remove, print_yes_no_undef)
+@@ -583,13 +632,13 @@ declare_hw_snprint(deferred_remove, print_yes_no_undef)
  declare_mp_handler(deferred_remove, set_yes_no_undef)
  declare_mp_snprint(deferred_remove, print_yes_no_undef)
  
@@ -193,8 +193,8 @@ index a8872da7..686f4d5c 100644
  declare_def_snprint(uev_wait_timeout, print_int)
  
  declare_def_handler(strict_timing, set_yes_no)
-@@ -662,19 +711,19 @@ static int snprint_def_disable_changed_wwids(struct config *conf, char *buff,
+@@ -616,19 +665,19 @@ static int snprint_def_disable_changed_wwids(struct config *conf,
- 	return print_ignored(buff, len);
+ 	return print_ignored(buff);
  }
  
 -declare_def_handler(remove_retries, set_int)
@@ -219,7 +219,7 @@ index a8872da7..686f4d5c 100644
  declare_def_snprint_defint(find_multipaths_timeout, print_int,
  			   DEFAULT_FIND_MULTIPATHS_TIMEOUT)
  
-@@ -1437,27 +1486,7 @@ declare_ovr_snprint(recheck_wwid, print_yes_no_undef)
+@@ -1385,27 +1434,7 @@ declare_ovr_snprint(recheck_wwid, print_yes_no_undef)
  declare_hw_handler(recheck_wwid, set_yes_no_undef)
  declare_hw_snprint(recheck_wwid, print_yes_no_undef)
  

SOURCES/0027-multipathd-add-del-maps-multipathd-command.patch

@@ -1,160 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Mon, 15 Jun 2020 17:00:54 -0500
-Subject: [PATCH] multipathd: add "del maps" multipathd command
-
-This will flush all multipath devices.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/devmapper.c  |  7 +++++--
- libmultipath/devmapper.h  |  2 +-
- multipath/main.c          |  2 +-
- multipathd/cli.c          |  1 +
- multipathd/cli_handlers.c | 19 +++++++++++++++++++
- multipathd/cli_handlers.h |  1 +
- multipathd/main.c         |  3 ++-
- multipathd/main.h         |  1 +
- 8 files changed, 31 insertions(+), 5 deletions(-)
-
-diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
-index cda83ce4..7f98bf9d 100644
---- a/libmultipath/devmapper.c
-+++ b/libmultipath/devmapper.c
-@@ -951,7 +951,7 @@ dm_flush_map_nopaths(const char * mapname, int deferred_remove)
- 
- #endif
- 
--int dm_flush_maps (int retries)
-+int dm_flush_maps (int need_suspend, int retries)
- {
- 	int r = 1;
- 	struct dm_task *dmt;
-@@ -974,7 +974,10 @@ int dm_flush_maps (int retries)
- 
- 	r = 0;
- 	do {
--		r |= dm_suspend_and_flush_map(names->name, retries);
-+		if (need_suspend)
-+			r |= dm_suspend_and_flush_map(names->name, retries);
-+		else
-+			r |= dm_flush_map(names->name);
- 		next = names->next;
- 		names = (void *) names + next;
- 	} while (next);
-diff --git a/libmultipath/devmapper.h b/libmultipath/devmapper.h
-index adb55000..7e8812ad 100644
---- a/libmultipath/devmapper.h
-+++ b/libmultipath/devmapper.h
-@@ -55,7 +55,7 @@ int dm_flush_map_nopaths(const char * mapname, int deferred_remove);
- #define dm_suspend_and_flush_map(mapname, retries) \
- 	_dm_flush_map(mapname, 1, 0, 1, retries)
- int dm_cancel_deferred_remove(struct multipath *mpp);
--int dm_flush_maps (int retries);
-+int dm_flush_maps (int need_suspend, int retries);
- int dm_fail_path(const char * mapname, char * path);
- int dm_reinstate_path(const char * mapname, char * path);
- int dm_queue_if_no_path(const char *mapname, int enable);
-diff --git a/multipath/main.c b/multipath/main.c
-index 78822ee1..7ab3102f 100644
---- a/multipath/main.c
-+++ b/multipath/main.c
-@@ -1127,7 +1127,7 @@ main (int argc, char *argv[])
- 		goto out;
- 	}
- 	else if (conf->remove == FLUSH_ALL) {
--		r = dm_flush_maps(retries) ? RTVL_FAIL : RTVL_OK;
-+		r = dm_flush_maps(1, retries) ? RTVL_FAIL : RTVL_OK;
- 		goto out;
- 	}
- 	while ((r = configure(conf, cmd, dev_type, dev)) == RTVL_RETRY)
-diff --git a/multipathd/cli.c b/multipathd/cli.c
-index 800c0fbe..bdc9fb10 100644
---- a/multipathd/cli.c
-+++ b/multipathd/cli.c
-@@ -568,6 +568,7 @@ cli_init (void) {
- 	add_handler(DEL+PATH, NULL);
- 	add_handler(ADD+MAP, NULL);
- 	add_handler(DEL+MAP, NULL);
-+	add_handler(DEL+MAPS, NULL);
- 	add_handler(SWITCH+MAP+GROUP, NULL);
- 	add_handler(RECONFIGURE, NULL);
- 	add_handler(SUSPEND+MAP, NULL);
-diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c
-index 31c3d9fd..782bb003 100644
---- a/multipathd/cli_handlers.c
-+++ b/multipathd/cli_handlers.c
-@@ -852,6 +852,25 @@ cli_del_map (void * v, char ** reply, int * len, void * data)
- 	return rc;
- }
- 
-+int
-+cli_del_maps (void *v, char **reply, int *len, void *data)
-+{
-+	struct vectors * vecs = (struct vectors *)data;
-+	struct multipath *mpp;
-+	int i, ret = 0;
-+
-+	condlog(2, "remove maps (operator)");
-+	vector_foreach_slot(vecs->mpvec, mpp, i) {
-+		if (flush_map(mpp, vecs, 0))
-+			ret++;
-+		else
-+			i--;
-+	}
-+	/* flush any multipath maps that aren't currently known by multipathd */
-+	ret |= dm_flush_maps(0, 0);
-+	return ret;
-+}
-+
- int
- cli_reload(void *v, char **reply, int *len, void *data)
- {
-diff --git a/multipathd/cli_handlers.h b/multipathd/cli_handlers.h
-index 0f451064..6f57b429 100644
---- a/multipathd/cli_handlers.h
-+++ b/multipathd/cli_handlers.h
-@@ -26,6 +26,7 @@ int cli_add_path (void * v, char ** reply, int * len, void * data);
- int cli_del_path (void * v, char ** reply, int * len, void * data);
- int cli_add_map (void * v, char ** reply, int * len, void * data);
- int cli_del_map (void * v, char ** reply, int * len, void * data);
-+int cli_del_maps (void * v, char ** reply, int * len, void * data);
- int cli_switch_group(void * v, char ** reply, int * len, void * data);
- int cli_reconfigure(void * v, char ** reply, int * len, void * data);
- int cli_resize(void * v, char ** reply, int * len, void * data);
-diff --git a/multipathd/main.c b/multipathd/main.c
-index 1d9ce7f7..1d0579e9 100644
---- a/multipathd/main.c
-+++ b/multipathd/main.c
-@@ -631,7 +631,7 @@ sync_maps_state(vector mpvec)
- 		sync_map_state(mpp);
- }
- 
--static int
-+int
- flush_map(struct multipath * mpp, struct vectors * vecs, int nopaths)
- {
- 	int r;
-@@ -1551,6 +1551,7 @@ uxlsnrloop (void * ap)
- 	set_handler_callback(DEL+PATH, cli_del_path);
- 	set_handler_callback(ADD+MAP, cli_add_map);
- 	set_handler_callback(DEL+MAP, cli_del_map);
-+	set_handler_callback(DEL+MAPS, cli_del_maps);
- 	set_handler_callback(SWITCH+MAP+GROUP, cli_switch_group);
- 	set_unlocked_handler_callback(RECONFIGURE, cli_reconfigure);
- 	set_handler_callback(SUSPEND+MAP, cli_suspend);
-diff --git a/multipathd/main.h b/multipathd/main.h
-index 7bb8463f..5dff17e5 100644
---- a/multipathd/main.h
-+++ b/multipathd/main.h
-@@ -28,6 +28,7 @@ int ev_add_path (struct path *, struct vectors *, int);
- int ev_remove_path (struct path *, struct vectors *, int);
- int ev_add_map (char *, const char *, struct vectors *);
- int ev_remove_map (char *, char *, int, struct vectors *);
-+int flush_map(struct multipath *, struct vectors *, int);
- int set_config_state(enum daemon_status);
- void * mpath_alloc_prin_response(int prin_sa);
- int prin_do_scsi_ioctl(char *, int rq_servact, struct prin_resp * resp,
--- 
-2.17.2
-

SOURCES/0028-libmultipath-improve-checks-for-set_str.patch

@@ -13,11 +13,11 @@ the existing config string, if any.
 
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
- libmultipath/dict.c | 89 +++++++++++++++++++++++++++++++++++++++------
+ libmultipath/dict.c | 88 +++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 78 insertions(+), 11 deletions(-)
+ 1 file changed, 78 insertions(+), 10 deletions(-)
 
 diff --git a/libmultipath/dict.c b/libmultipath/dict.c
-index 686f4d5c..d547d898 100644
+index 57b6a7b6..149d3348 100644
 --- a/libmultipath/dict.c
 +++ b/libmultipath/dict.c
 @@ -5,6 +5,8 @@
@@ -29,12 +29,9 @@ index 686f4d5c..d547d898 100644
  #include <pwd.h>
  #include <string.h>
  #include "checkers.h"
-@@ -121,7 +123,72 @@ set_regex(vector strvec, void *ptr, const char *file, int line_nr)
+@@ -111,6 +113,72 @@ set_str(vector strvec, void *ptr, const char *file, int line_nr)
- 
+ 	return 0;
- 	if (!*str_ptr)
+ }
- 		return 1;
-+	return 0;
-+}
  
 +static int
 +set_dir(vector strvec, void *ptr, const char *file, int line_nr)
@@ -99,17 +96,13 @@ index 686f4d5c..d547d898 100644
 +		*str_ptr = old_str;
 +	} else
 +		free(old_str);
- 	return 0;
++	return 0;
- }
++}
- 
++
-@@ -400,19 +467,19 @@ declare_def_snprint(checkint, print_int)
+ static int
- declare_def_handler(max_checkint, set_uint)
+ set_yes_no(vector strvec, void *ptr, const char *file, int line_nr)
- declare_def_snprint(max_checkint, print_int)
+ {
- 
+@@ -353,13 +421,13 @@ declare_def_snprint(verbosity, print_int)
--declare_def_range_handler(verbosity, 0, MAX_VERBOSITY)
-+declare_def_range_handler(verbosity, 0, 4)
- declare_def_snprint(verbosity, print_int)
- 
  declare_def_handler(reassign_maps, set_yes_no)
  declare_def_snprint(reassign_maps, print_yes_no)
  
@@ -125,7 +118,7 @@ index 686f4d5c..d547d898 100644
  
  	if (rc != 0)
  		return rc;
-@@ -545,11 +612,11 @@ declare_hw_snprint(prio_name, print_str)
+@@ -490,11 +558,11 @@ declare_hw_snprint(prio_name, print_str)
  declare_mp_handler(prio_name, set_str)
  declare_mp_snprint(prio_name, print_str)
  
@@ -140,7 +133,7 @@ index 686f4d5c..d547d898 100644
  declare_hw_snprint(alias_prefix, print_str)
  
  declare_def_handler(prio_args, set_str)
-@@ -633,13 +700,13 @@ declare_hw_snprint(user_friendly_names, print_yes_no_undef)
+@@ -586,13 +654,13 @@ declare_hw_snprint(user_friendly_names, print_yes_no_undef)
  declare_mp_handler(user_friendly_names, set_yes_no_undef)
  declare_mp_snprint(user_friendly_names, print_yes_no_undef)
  
@@ -157,7 +150,7 @@ index 686f4d5c..d547d898 100644
  declare_def_snprint(prkeys_file, print_str)
  
  declare_def_handler(retain_hwhandler, set_yes_no_undef)
-@@ -738,7 +805,7 @@ def_config_dir_handler(struct config *conf, vector strvec, const char *file,
+@@ -692,7 +760,7 @@ def_config_dir_handler(struct config *conf, vector strvec, const char *file,
  	/* this is only valid in the main config file */
  	if (conf->processed_main_config)
  		return 0;
@@ -166,7 +159,7 @@ index 686f4d5c..d547d898 100644
  }
  declare_def_snprint(config_dir, print_str)
  
-@@ -1781,7 +1848,7 @@ multipath_handler(struct config *conf, vector strvec, const char *file,
+@@ -1732,7 +1800,7 @@ multipath_handler(struct config *conf, vector strvec, const char *file,
  declare_mp_handler(wwid, set_str)
  declare_mp_snprint(wwid, print_str)
  

SOURCES/0028-multipath-make-flushing-maps-work-like-other-command.patch

@@ -1,103 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Mon, 15 Jun 2020 23:54:29 -0500
-Subject: [PATCH] multipath: make flushing maps work like other commands
-
-The config structure doesn't need a special variable just for removes.
-Multipath can just use the cmd variable, like it does for the other
-commands.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/config.h    |  3 ++-
- libmultipath/configure.h |  3 ---
- multipath/main.c         | 20 ++++++++++----------
- 3 files changed, 12 insertions(+), 14 deletions(-)
-
-diff --git a/libmultipath/config.h b/libmultipath/config.h
-index 3368d8c9..4042eba6 100644
---- a/libmultipath/config.h
-+++ b/libmultipath/config.h
-@@ -39,6 +39,8 @@ enum mpath_cmds {
- 	CMD_ADD_WWID,
- 	CMD_USABLE_PATHS,
- 	CMD_DUMP_CONFIG,
-+	CMD_FLUSH_ONE,
-+	CMD_FLUSH_ALL,
- };
- 
- enum force_reload_types {
-@@ -143,7 +145,6 @@ struct config {
- 	unsigned int max_checkint;
- 	bool use_watchdog;
- 	int pgfailback;
--	int remove;
- 	int rr_weight;
- 	int no_path_retry;
- 	int user_friendly_names;
-diff --git a/libmultipath/configure.h b/libmultipath/configure.h
-index d7509000..0e33bf40 100644
---- a/libmultipath/configure.h
-+++ b/libmultipath/configure.h
-@@ -45,9 +45,6 @@ enum {
- 	CP_RETRY,
- };
- 
--#define FLUSH_ONE 1
--#define FLUSH_ALL 2
--
- struct vectors;
- 
- int setup_map (struct multipath * mpp, char * params, int params_size,
-diff --git a/multipath/main.c b/multipath/main.c
-index 7ab3102f..a2080029 100644
---- a/multipath/main.c
-+++ b/multipath/main.c
-@@ -942,10 +942,10 @@ main (int argc, char *argv[])
- 				cmd = CMD_DRY_RUN;
- 			break;
- 		case 'f':
--			conf->remove = FLUSH_ONE;
-+			cmd = CMD_FLUSH_ONE;
- 			break;
- 		case 'F':
--			conf->remove = FLUSH_ALL;
-+			cmd = CMD_FLUSH_ALL;
- 			break;
- 		case 'l':
- 			if (optarg && !strncmp(optarg, "l", 1))
-@@ -1084,6 +1084,10 @@ main (int argc, char *argv[])
- 		condlog(0, "the -w option requires a device");
- 		goto out;
- 	}
-+	if (cmd == CMD_FLUSH_ONE && dev_type != DEV_DEVMAP) {
-+		condlog(0, "the -f option requires a map name to remove");
-+		goto out;
-+	}
- 
- 	switch(delegate_to_multipathd(cmd, dev, dev_type, conf)) {
- 	case DELEGATE_OK:
-@@ -1117,16 +1121,12 @@ main (int argc, char *argv[])
- 	}
- 	if (retries < 0)
- 		retries = conf->remove_retries;
--	if (conf->remove == FLUSH_ONE) {
--		if (dev_type == DEV_DEVMAP) {
--			r = dm_suspend_and_flush_map(dev, retries) ?
--				RTVL_FAIL : RTVL_OK;
--		} else
--			condlog(0, "must provide a map name to remove");
--
-+	if (cmd == CMD_FLUSH_ONE) {
-+		r = dm_suspend_and_flush_map(dev, retries) ?
-+		    RTVL_FAIL : RTVL_OK;
- 		goto out;
- 	}
--	else if (conf->remove == FLUSH_ALL) {
-+	else if (cmd == CMD_FLUSH_ALL) {
- 		r = dm_flush_maps(1, retries) ? RTVL_FAIL : RTVL_OK;
- 		goto out;
- 	}
--- 
-2.17.2
-

SOURCES/0029-libmultipath-deprecate-file-and-directory-config-opt.patch

@@ -0,0 +1,114 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Benjamin Marzinski <bmarzins@redhat.com>
+Date: Wed, 10 Nov 2021 18:34:08 -0600
+Subject: [PATCH] libmultipath: deprecate file and directory config options
+
+Having multipath able to select pathnames for the files and directories
+it needs causes unnecessary maintainer headaches. Mark these as
+deprecated, but still support them for now.
+
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ libmultipath/dict.c        | 19 +++++++++++++++----
+ multipath/multipath.conf.5 |  5 +++++
+ 2 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/libmultipath/dict.c b/libmultipath/dict.c
+index 149d3348..d14be340 100644
+--- a/libmultipath/dict.c
++++ b/libmultipath/dict.c
+@@ -268,6 +268,15 @@ def_ ## option ## _handler (struct config *conf, vector strvec,		\
+ 	return function (strvec, &conf->option, file, line_nr);		\
+ }
+ 
++#define declare_def_warn_handler(option, function)			\
++static int								\
++def_ ## option ## _handler (struct config *conf, vector strvec,		\
++			    const char *file, int line_nr)		\
++{									\
++	condlog(2, "%s line %d, \"" #option "\" is deprecated and will be disabled in a future release", file, line_nr);				\
++	return function (strvec, &conf->option, file, line_nr);		\
++}
++
+ #define declare_def_range_handler(option, minval, maxval)			\
+ static int								\
+ def_ ## option ## _handler (struct config *conf, vector strvec,         \
+@@ -421,7 +430,7 @@ declare_def_snprint(verbosity, print_int)
+ declare_def_handler(reassign_maps, set_yes_no)
+ declare_def_snprint(reassign_maps, print_yes_no)
+ 
+-declare_def_handler(multipath_dir, set_dir)
++declare_def_warn_handler(multipath_dir, set_dir)
+ declare_def_snprint(multipath_dir, print_str)
+ 
+ static int def_partition_delim_handler(struct config *conf, vector strvec,
+@@ -654,13 +663,13 @@ declare_hw_snprint(user_friendly_names, print_yes_no_undef)
+ declare_mp_handler(user_friendly_names, set_yes_no_undef)
+ declare_mp_snprint(user_friendly_names, print_yes_no_undef)
+ 
+-declare_def_handler(bindings_file, set_path)
++declare_def_warn_handler(bindings_file, set_path)
+ declare_def_snprint(bindings_file, print_str)
+ 
+-declare_def_handler(wwids_file, set_path)
++declare_def_warn_handler(wwids_file, set_path)
+ declare_def_snprint(wwids_file, print_str)
+ 
+-declare_def_handler(prkeys_file, set_path)
++declare_def_warn_handler(prkeys_file, set_path)
+ declare_def_snprint(prkeys_file, print_str)
+ 
+ declare_def_handler(retain_hwhandler, set_yes_no_undef)
+@@ -760,6 +769,8 @@ def_config_dir_handler(struct config *conf, vector strvec, const char *file,
+ 	/* this is only valid in the main config file */
+ 	if (conf->processed_main_config)
+ 		return 0;
++	condlog(2, "%s line %d, \"config_dir\" is deprecated and will be disabled in a future release",
++		file, line_nr);
+ 	return set_path(strvec, &conf->config_dir, file, line_nr);
+ }
+ declare_def_snprint(config_dir, print_str)
+diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
+index dd9f4dc7..7f85f766 100644
+--- a/multipath/multipath.conf.5
++++ b/multipath/multipath.conf.5
+@@ -178,6 +178,7 @@ The default is: \fBno\fR
+ .
+ .TP
+ .B multipath_dir
++This option is deprecated, and will be removed in a future release.
+ Directory where the dynamic shared objects are stored. Defined at compile time,
+ commonly \fI/lib64/multipath/\fR or \fI/lib/multipath/\fR.
+ .RS
+@@ -742,6 +743,7 @@ The default is: \fB<unset>\fR
+ .
+ .TP
+ .B bindings_file
++This option is deprecated, and will be removed in a future release.
+ The full pathname of the binding file to be used when the user_friendly_names
+ option is set.
+ .RS
+@@ -752,6 +754,7 @@ The default is: \fB/etc/multipath/bindings\fR
+ .
+ .TP
+ .B wwids_file
++This option is deprecated, and will be removed in a future release.
+ The full pathname of the WWIDs file, which is used by multipath to keep track
+ of the WWIDs for LUNs it has created multipath devices on in the past.
+ .RS
+@@ -762,6 +765,7 @@ The default is: \fB/etc/multipath/wwids\fR
+ .
+ .TP
+ .B prkeys_file
++This option is deprecated, and will be removed in a future release.
+ The full pathname of the prkeys file, which is used by multipathd to keep
+ track of the persistent reservation key used for a specific WWID, when
+ \fIreservation_key\fR is set to \fBfile\fR.
+@@ -933,6 +937,7 @@ The default is: \fB<unset>\fR
+ .
+ .TP
+ .B config_dir
++This option is deprecated, and will be removed in a future release.
+ If set to anything other than "", multipath will search this directory
+ alphabetically for file ending in ".conf" and it will read configuration
+ information from them, just as if it was in \fI/etc/multipath.conf\fR.

SOURCES/0029-multipath-delegate-flushing-maps-to-multipathd.patch

@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Tue, 16 Jun 2020 16:25:34 -0500
-Subject: [PATCH] multipath: delegate flushing maps to multipathd
-
-Since there can be problems with removing maps outside of multipathd,
-multipath should attempt to delegate this command to multipathd.
-However, multipathd doesn't attempt to suspend the device, in order
-to avoid potential hangs. If delegating to multipathd fails, multipath
-should try the remove itself.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- multipath/main.c      | 14 ++++++++++++++
- multipath/multipath.8 |  4 ++--
- 2 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/multipath/main.c b/multipath/main.c
-index a2080029..612c6815 100644
---- a/multipath/main.c
-+++ b/multipath/main.c
-@@ -828,6 +828,20 @@ int delegate_to_multipathd(enum mpath_cmds cmd,
- 	if (cmd == CMD_CREATE && conf->force_reload == FORCE_RELOAD_YES) {
- 		p += snprintf(p, n, "reconfigure");
- 	}
-+	else if (cmd == CMD_FLUSH_ONE && dev && dev_type == DEV_DEVMAP) {
-+		p += snprintf(p, n, "del map %s", dev);
-+		/* multipathd doesn't try as hard, to avoid potentially
-+		 * hanging. If it fails, retry with the regular multipath
-+		 * command */
-+		r = NOT_DELEGATED;
-+	}
-+	else if (cmd == CMD_FLUSH_ALL) {
-+		p += snprintf(p, n, "del maps");
-+		/* multipathd doesn't try as hard, to avoid potentially
-+		 * hanging. If it fails, retry with the regular multipath
-+		 * command */
-+		r = NOT_DELEGATED;
-+	}
- 	/* Add other translations here */
- 
- 	if (strlen(command) == 0)
-diff --git a/multipath/multipath.8 b/multipath/multipath.8
-index 8befc45a..47a33f9b 100644
---- a/multipath/multipath.8
-+++ b/multipath/multipath.8
-@@ -125,11 +125,11 @@ the system.
- Other operation modes are chosen by using one of the following command line switches:
- .TP
- .B \-f
--Flush (remove) a multipath device map specified as parameter, if unused.
-+Flush (remove) a multipath device map specified as parameter, if unused. This operation is delegated to the multipathd daemon if it's running.
- .
- .TP
- .B \-F
--Flush (remove) all unused multipath device maps.
-+Flush (remove) all unused multipath device maps. This operation is delegated to the multipathd daemon if it's running.
- .
- .TP
- .B \-l
--- 
-2.17.2
-

SOURCES/0030-libmultipath-split-set_int-to-enable-reuse.patch

@@ -14,11 +14,11 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  1 file changed, 46 insertions(+), 36 deletions(-)
 
 diff --git a/libmultipath/dict.c b/libmultipath/dict.c
-index d547d898..6330836a 100644
+index d14be340..68647061 100644
 --- a/libmultipath/dict.c
 +++ b/libmultipath/dict.c
-@@ -30,17 +30,12 @@
+@@ -31,17 +31,12 @@
- #include "dict.h"
+ #include "strbuf.h"
  
  static int
 -set_int(vector strvec, void *ptr, int min, int max, const char *file,
@@ -38,7 +38,7 @@ index d547d898..6330836a 100644
  
  	res = strtol(buff, &eptr, 10);
  	if (eptr > buff)
-@@ -49,17 +44,30 @@ set_int(vector strvec, void *ptr, int min, int max, const char *file,
+@@ -50,17 +45,30 @@ set_int(vector strvec, void *ptr, int min, int max, const char *file,
  	if (*buff == '\0' || *eptr != '\0') {
  		condlog(1, "%s line %d, invalid value for %s: \"%s\"",
  			file, line_nr, (char*)VECTOR_SLOT(strvec, 0), buff);
@@ -78,7 +78,7 @@ index d547d898..6330836a 100644
  
  	FREE(buff);
  	return rc;
-@@ -965,6 +973,7 @@ declare_mp_attr_snprint(gid, print_gid)
+@@ -929,6 +937,7 @@ declare_mp_attr_snprint(gid, print_gid)
  static int
  set_undef_off_zero(vector strvec, void *ptr, const char *file, int line_nr)
  {
@@ -86,7 +86,7 @@ index d547d898..6330836a 100644
  	char * buff;
  	int *int_ptr = (int *)ptr;
  
-@@ -974,10 +983,10 @@ set_undef_off_zero(vector strvec, void *ptr, const char *file, int line_nr)
+@@ -938,10 +947,10 @@ set_undef_off_zero(vector strvec, void *ptr, const char *file, int line_nr)
  
  	if (strcmp(buff, "off") == 0)
  		*int_ptr = UOZ_OFF;
@@ -101,7 +101,7 @@ index d547d898..6330836a 100644
  		*int_ptr = UOZ_ZERO;
  
  	FREE(buff);
-@@ -1130,14 +1139,12 @@ max_fds_handler(struct config *conf, vector strvec, const char *file,
+@@ -1093,14 +1102,12 @@ max_fds_handler(struct config *conf, vector strvec, const char *file,
  		/* Assume safe limit */
  		max_fds = 4096;
  	}
@@ -121,7 +121,7 @@ index d547d898..6330836a 100644
  
  	FREE(buff);
  
-@@ -1206,6 +1213,7 @@ declare_mp_snprint(rr_weight, print_rr_weight)
+@@ -1169,6 +1176,7 @@ declare_mp_snprint(rr_weight, print_rr_weight)
  static int
  set_pgfailback(vector strvec, void *ptr, const char *file, int line_nr)
  {
@@ -129,7 +129,7 @@ index d547d898..6330836a 100644
  	int *int_ptr = (int *)ptr;
  	char * buff;
  
-@@ -1220,11 +1228,11 @@ set_pgfailback(vector strvec, void *ptr, const char *file, int line_nr)
+@@ -1183,11 +1191,11 @@ set_pgfailback(vector strvec, void *ptr, const char *file, int line_nr)
  	else if (strlen(buff) == 10 && !strcmp(buff, "followover"))
  		*int_ptr = -FAILBACK_FOLLOWOVER;
  	else
@@ -143,7 +143,7 @@ index d547d898..6330836a 100644
  }
  
  int
-@@ -1256,6 +1264,7 @@ declare_mp_snprint(pgfailback, print_pgfailback)
+@@ -1219,6 +1227,7 @@ declare_mp_snprint(pgfailback, print_pgfailback)
  static int
  no_path_retry_helper(vector strvec, void *ptr, const char *file, int line_nr)
  {
@@ -151,7 +151,7 @@ index d547d898..6330836a 100644
  	int *int_ptr = (int *)ptr;
  	char * buff;
  
-@@ -1267,11 +1276,11 @@ no_path_retry_helper(vector strvec, void *ptr, const char *file, int line_nr)
+@@ -1230,11 +1239,11 @@ no_path_retry_helper(vector strvec, void *ptr, const char *file, int line_nr)
  		*int_ptr = NO_PATH_RETRY_FAIL;
  	else if (!strcmp(buff, "queue"))
  		*int_ptr = NO_PATH_RETRY_QUEUE;
@@ -166,7 +166,7 @@ index d547d898..6330836a 100644
  }
  
  int
-@@ -1416,6 +1425,7 @@ snprint_mp_reservation_key (struct config *conf, char * buff, int len,
+@@ -1376,6 +1385,7 @@ snprint_mp_reservation_key (struct config *conf, struct strbuf *buff,
  static int
  set_off_int_undef(vector strvec, void *ptr, const char *file, int line_nr)
  {
@@ -174,7 +174,7 @@ index d547d898..6330836a 100644
  	int *int_ptr = (int *)ptr;
  	char * buff;
  
-@@ -1425,11 +1435,11 @@ set_off_int_undef(vector strvec, void *ptr, const char *file, int line_nr)
+@@ -1385,11 +1395,11 @@ set_off_int_undef(vector strvec, void *ptr, const char *file, int line_nr)
  
  	if (!strcmp(buff, "no") || !strcmp(buff, "0"))
  		*int_ptr = NU_NO;

SOURCES/0030-multipath-add-option-to-skip-multipathd-delegation.patch

@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Tue, 16 Jun 2020 17:36:33 -0500
-Subject: [PATCH] multipath: add option to skip multipathd delegation
-
-Add the -D option to allow users to skip delegating commands to
-multipathd.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/config.h | 1 +
- multipath/main.c      | 8 +++++++-
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/libmultipath/config.h b/libmultipath/config.h
-index 4042eba6..160867cd 100644
---- a/libmultipath/config.h
-+++ b/libmultipath/config.h
-@@ -191,6 +191,7 @@ struct config {
- 	int ghost_delay;
- 	int find_multipaths_timeout;
- 	int marginal_pathgroups;
-+	int skip_delegate;
- 	unsigned int version[3];
- 	unsigned int sequence_nr;
- 
-diff --git a/multipath/main.c b/multipath/main.c
-index 612c6815..3c3d2398 100644
---- a/multipath/main.c
-+++ b/multipath/main.c
-@@ -825,6 +825,9 @@ int delegate_to_multipathd(enum mpath_cmds cmd,
- 	*p = '\0';
- 	n = sizeof(command);
- 
-+	if (conf->skip_delegate)
-+		return NOT_DELEGATED;
-+
- 	if (cmd == CMD_CREATE && conf->force_reload == FORCE_RELOAD_YES) {
- 		p += snprintf(p, n, "reconfigure");
- 	}
-@@ -923,7 +926,7 @@ main (int argc, char *argv[])
- 	multipath_conf = conf;
- 	conf->retrigger_tries = 0;
- 	conf->force_sync = 1;
--	while ((arg = getopt(argc, argv, ":aAdcChl::FfM:v:p:b:BrR:itTquUwW")) != EOF ) {
-+	while ((arg = getopt(argc, argv, ":aAdDcChl::FfM:v:p:b:BrR:itTquUwW")) != EOF ) {
- 		switch(arg) {
- 		case 1: printf("optarg : %s\n",optarg);
- 			break;
-@@ -955,6 +958,9 @@ main (int argc, char *argv[])
- 			if (cmd == CMD_CREATE)
- 				cmd = CMD_DRY_RUN;
- 			break;
-+		case 'D':
-+			conf->skip_delegate = 1;
-+			break;
- 		case 'f':
- 			cmd = CMD_FLUSH_ONE;
- 			break;
--- 
-2.17.2
-

SOURCES/0031-libmultipath-cleanup-invalid-config-handling.patch

@@ -14,10 +14,10 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  1 file changed, 51 insertions(+), 22 deletions(-)
 
 diff --git a/libmultipath/dict.c b/libmultipath/dict.c
-index 6330836a..b255322e 100644
+index 68647061..c534d703 100644
 --- a/libmultipath/dict.c
 +++ b/libmultipath/dict.c
-@@ -212,8 +212,11 @@ set_yes_no(vector strvec, void *ptr, const char *file, int line_nr)
+@@ -199,8 +199,11 @@ set_yes_no(vector strvec, void *ptr, const char *file, int line_nr)
  
  	if (strcmp(buff, "yes") == 0 || strcmp(buff, "1") == 0)
  		*int_ptr = YN_YES;
@@ -30,7 +30,7 @@ index 6330836a..b255322e 100644
  
  	FREE(buff);
  	return 0;
-@@ -234,7 +237,8 @@ set_yes_no_undef(vector strvec, void *ptr, const char *file, int line_nr)
+@@ -221,7 +224,8 @@ set_yes_no_undef(vector strvec, void *ptr, const char *file, int line_nr)
  	else if (strcmp(buff, "yes") == 0 || strcmp(buff, "1") == 0)
  		*int_ptr = YNU_YES;
  	else
@@ -40,7 +40,7 @@ index 6330836a..b255322e 100644
  
  	FREE(buff);
  	return 0;
-@@ -523,9 +527,6 @@ def_find_multipaths_handler(struct config *conf, vector strvec,
+@@ -480,9 +484,6 @@ def_find_multipaths_handler(struct config *conf, vector strvec,
  	char *buff;
  	int i;
  
@@ -50,7 +50,7 @@ index 6330836a..b255322e 100644
  	buff = set_value(strvec);
  	if (!buff)
  		return 1;
-@@ -538,9 +539,14 @@ def_find_multipaths_handler(struct config *conf, vector strvec,
+@@ -495,9 +496,14 @@ def_find_multipaths_handler(struct config *conf, vector strvec,
  		}
  	}
  
@@ -68,7 +68,7 @@ index 6330836a..b255322e 100644
  	}
  
  	FREE(buff);
-@@ -591,8 +597,10 @@ static int uid_attrs_handler(struct config *conf, vector strvec,
+@@ -546,8 +552,10 @@ static int uid_attrs_handler(struct config *conf, vector strvec,
  	if (!val)
  		return 1;
  	if (parse_uid_attrs(val, conf))
@@ -81,7 +81,7 @@ index 6330836a..b255322e 100644
  	FREE(val);
  	return 0;
  }
-@@ -811,8 +819,11 @@ def_config_dir_handler(struct config *conf, vector strvec, const char *file,
+@@ -775,8 +783,11 @@ def_config_dir_handler(struct config *conf, vector strvec, const char *file,
  		       int line_nr)
  {
  	/* this is only valid in the main config file */
@@ -91,10 +91,10 @@ index 6330836a..b255322e 100644
 +			file, line_nr);
  		return 0;
 +	}
+ 	condlog(2, "%s line %d, \"config_dir\" is deprecated and will be disabled in a future release",
+ 		file, line_nr);
  	return set_path(strvec, &conf->config_dir, file, line_nr);
- }
+@@ -836,7 +847,9 @@ set_mode(vector strvec, void *ptr, int *flags, const char *file, int line_nr)
- declare_def_snprint(config_dir, print_str)
-@@ -872,7 +883,9 @@ set_mode(vector strvec, void *ptr, int *flags, const char *file, int line_nr)
  	if (sscanf(buff, "%o", &mode) == 1 && mode <= 0777) {
  		*flags |= (1 << ATTR_MODE);
  		*mode_ptr = mode;
@@ -105,7 +105,7 @@ index 6330836a..b255322e 100644
  
  	FREE(buff);
  	return 0;
-@@ -897,7 +910,9 @@ set_uid(vector strvec, void *ptr, int *flags, const char *file, int line_nr)
+@@ -861,7 +874,9 @@ set_uid(vector strvec, void *ptr, int *flags, const char *file, int line_nr)
  	else if (sscanf(buff, "%u", &uid) == 1){
  		*flags |= (1 << ATTR_UID);
  		*uid_ptr = uid;
@@ -116,7 +116,7 @@ index 6330836a..b255322e 100644
  
  	FREE(buff);
  	return 0;
-@@ -923,7 +938,9 @@ set_gid(vector strvec, void *ptr, int *flags, const char *file, int line_nr)
+@@ -887,7 +902,9 @@ set_gid(vector strvec, void *ptr, int *flags, const char *file, int line_nr)
  	else if (sscanf(buff, "%u", &gid) == 1){
  		*flags |= (1 << ATTR_GID);
  		*gid_ptr = gid;
@@ -127,17 +127,17 @@ index 6330836a..b255322e 100644
  	FREE(buff);
  	return 0;
  }
-@@ -1026,7 +1043,8 @@ set_dev_loss(vector strvec, void *ptr, const char *file, int line_nr)
+@@ -989,7 +1006,8 @@ set_dev_loss(vector strvec, void *ptr, const char *file, int line_nr)
  	if (!strcmp(buff, "infinity"))
  		*uint_ptr = MAX_DEV_LOSS_TMO;
  	else if (sscanf(buff, "%u", uint_ptr) != 1)
--		*uint_ptr = 0;
+-		*uint_ptr = DEV_LOSS_TMO_UNSET;
 +		condlog(1, "%s line %d, invalid value for dev_loss_tmo: \"%s\"",
 +			file, line_nr, buff);
  
  	FREE(buff);
  	return 0;
-@@ -1060,13 +1078,19 @@ static int
+@@ -1023,13 +1041,19 @@ static int
  set_pgpolicy(vector strvec, void *ptr, const char *file, int line_nr)
  {
  	char * buff;
@@ -158,7 +158,7 @@ index 6330836a..b255322e 100644
  	FREE(buff);
  
  	return 0;
-@@ -1179,10 +1203,11 @@ set_rr_weight(vector strvec, void *ptr, const char *file, int line_nr)
+@@ -1142,10 +1166,11 @@ set_rr_weight(vector strvec, void *ptr, const char *file, int line_nr)
  
  	if (!strcmp(buff, "priorities"))
  		*int_ptr = RR_WEIGHT_PRIO;
@@ -173,7 +173,7 @@ index 6330836a..b255322e 100644
  	FREE(buff);
  
  	return 0;
-@@ -1318,10 +1343,13 @@ def_log_checker_err_handler(struct config *conf, vector strvec,
+@@ -1281,10 +1306,13 @@ def_log_checker_err_handler(struct config *conf, vector strvec,
  	if (!buff)
  		return 1;
  
@@ -189,7 +189,7 @@ index 6330836a..b255322e 100644
  
  	free(buff);
  	return 0;
-@@ -1585,7 +1613,8 @@ hw_vpd_vendor_handler(struct config *conf, vector strvec, const char *file,
+@@ -1545,7 +1573,8 @@ hw_vpd_vendor_handler(struct config *conf, vector strvec, const char *file,
  			goto out;
  		}
  	}

SOURCES/0031-libmultipath-fix-sysfs-dev_loss_tmo-parsing.patch

@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Thu, 25 Jun 2020 20:46:08 -0500
-Subject: [PATCH] libmultipath: fix sysfs dev_loss_tmo parsing
-
-dev_loss_tmo is a u32 value. However the kernel sysfs code prints it as
-a signed integer. This means that if dev_loss_tmo is above INT_MAX, the
-sysfs value will be a negative number. Parsing this was causing
-sysfs_set_rport_tmo() to fail.
-
-Signed-off-by: Martin Wilck <mwilck@suse.com>
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/discovery.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
-index ffec5162..83a41a4a 100644
---- a/libmultipath/discovery.c
-+++ b/libmultipath/discovery.c
-@@ -583,7 +583,7 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
- 	struct udev_device *rport_dev = NULL;
- 	char value[16], *eptr;
- 	char rport_id[32];
--	unsigned long long tmo = 0;
-+	unsigned int tmo;
- 	int ret;
- 
- 	sprintf(rport_id, "rport-%d:%d-%d",
-@@ -607,8 +607,8 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
- 			"error %d", rport_id, -ret);
- 		goto out;
- 	}
--	tmo = strtoull(value, &eptr, 0);
--	if (value == eptr || tmo == ULLONG_MAX) {
-+	tmo = strtoul(value, &eptr, 0);
-+	if (value == eptr) {
- 		condlog(0, "%s: Cannot parse dev_loss_tmo "
- 			"attribute '%s'", rport_id, value);
- 		goto out;
--- 
-2.17.2
-

SOURCES/0032-kpartx-read-devices-with-direct-IO.patch

@@ -1,267 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Fri, 26 Jun 2020 20:06:24 -0500
-Subject: [PATCH] kpartx: read devices with direct IO
-
-If kpartx is used on top of shared storage, and a device has its
-partition table changed on one machine, and then kpartx is run on
-another, it may not see the new data, because the cache still contains
-the old data, and there is nothing to tell the machine running kpartx to
-invalidate it. To solve this, kpartx should read the devices using
-direct io.
-
-One issue with how this code has been updated is that the original code
-for getblock() always read 1024 bytes. The new code reads a logical
-sector size chunk of the device, and returns a pointer to the 512 byte
-sector that the caller asked for, within that (possibly larger) chunk.
-This means that if the logical sector size is 512, then the code is now
-only reading 512 bytes.  Looking through the code for the various
-partition types, I can't see a case where more than 512 bytes is needed
-and getblock() is used.  If anyone has a reason why this code should be
-reading 1024 bytes at minmum, I can certainly change this.  But when I
-looked, I couldn't find a case where reading 512 bytes would cause a
-problem.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- kpartx/dasd.c   |  7 ++++---
- kpartx/gpt.c    | 22 +++++++++----------
- kpartx/kpartx.c | 56 +++++++++++++++++++++++++++++++++++++++----------
- kpartx/kpartx.h |  2 ++
- 4 files changed, 61 insertions(+), 26 deletions(-)
-
-diff --git a/kpartx/dasd.c b/kpartx/dasd.c
-index 14b9d3aa..f0398645 100644
---- a/kpartx/dasd.c
-+++ b/kpartx/dasd.c
-@@ -22,6 +22,7 @@
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#define _GNU_SOURCE
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -117,13 +118,13 @@ read_dasd_pt(int fd, __attribute__((unused)) struct slice all,
- 
- 		sprintf(pathname, "/dev/.kpartx-node-%u-%u",
- 			(unsigned int)major(dev), (unsigned int)minor(dev));
--		if ((fd_dasd = open(pathname, O_RDONLY)) == -1) {
-+		if ((fd_dasd = open(pathname, O_RDONLY | O_DIRECT)) == -1) {
- 			/* Devicenode does not exist. Try to create one */
- 			if (mknod(pathname, 0600 | S_IFBLK, dev) == -1) {
- 				/* Couldn't create a device node */
- 				return -1;
- 			}
--			fd_dasd = open(pathname, O_RDONLY);
-+			fd_dasd = open(pathname, O_RDONLY | O_DIRECT);
- 			/*
- 			 * The file will vanish when the last process (we)
- 			 * has ceased to access it.
-@@ -175,7 +176,7 @@ read_dasd_pt(int fd, __attribute__((unused)) struct slice all,
- 	 * Get volume label, extract name and type.
- 	 */
- 
--	if (!(data = (unsigned char *)malloc(blocksize)))
-+	if (aligned_malloc((void **)&data, blocksize, NULL))
- 		goto out;
- 
- 
-diff --git a/kpartx/gpt.c b/kpartx/gpt.c
-index 785b34ea..f7fefb70 100644
---- a/kpartx/gpt.c
-+++ b/kpartx/gpt.c
-@@ -243,8 +243,7 @@ alloc_read_gpt_entries(int fd, gpt_header * gpt)
- 
- 	if (!count) return NULL;
- 
--	pte = (gpt_entry *)malloc(count);
--	if (!pte)
-+	if (aligned_malloc((void **)&pte, get_sector_size(fd), &count))
- 		return NULL;
- 	memset(pte, 0, count);
- 
-@@ -269,12 +268,11 @@ static gpt_header *
- alloc_read_gpt_header(int fd, uint64_t lba)
- {
- 	gpt_header *gpt;
--	gpt = (gpt_header *)
--	    malloc(sizeof (gpt_header));
--	if (!gpt)
-+	size_t size = sizeof (gpt_header);
-+	if (aligned_malloc((void **)&gpt, get_sector_size(fd), &size))
- 		return NULL;
--	memset(gpt, 0, sizeof (*gpt));
--	if (!read_lba(fd, lba, gpt, sizeof (gpt_header))) {
-+	memset(gpt, 0, size);
-+	if (!read_lba(fd, lba, gpt, size)) {
- 		free(gpt);
- 		return NULL;
- 	}
-@@ -498,6 +496,7 @@ find_valid_gpt(int fd, gpt_header ** gpt, gpt_entry ** ptes)
- 	gpt_header *pgpt = NULL, *agpt = NULL;
- 	gpt_entry *pptes = NULL, *aptes = NULL;
- 	legacy_mbr *legacymbr = NULL;
-+	size_t size = sizeof(legacy_mbr);
- 	uint64_t lastlba;
- 	if (!gpt || !ptes)
- 		return 0;
-@@ -526,11 +525,10 @@ find_valid_gpt(int fd, gpt_header ** gpt, gpt_entry ** ptes)
- 	}
- 
- 	/* This will be added to the EFI Spec. per Intel after v1.02. */
--	legacymbr = malloc(sizeof (*legacymbr));
--	if (legacymbr) {
--		memset(legacymbr, 0, sizeof (*legacymbr));
--		read_lba(fd, 0, (uint8_t *) legacymbr,
--			 sizeof (*legacymbr));
-+	if (aligned_malloc((void **)&legacymbr, get_sector_size(fd),
-+			   &size) == 0) {
-+		memset(legacymbr, 0, size);
-+		read_lba(fd, 0, (uint8_t *) legacymbr, size);
- 		good_pmbr = is_pmbr_valid(legacymbr);
- 		free(legacymbr);
- 		legacymbr=NULL;
-diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c
-index d3620c5c..c24ad6d9 100644
---- a/kpartx/kpartx.c
-+++ b/kpartx/kpartx.c
-@@ -19,6 +19,7 @@
-  * cva, 2002-10-26
-  */
- 
-+#define _GNU_SOURCE
- #include <stdio.h>
- #include <fcntl.h>
- #include <errno.h>
-@@ -41,7 +42,6 @@
- 
- #define SIZE(a) (sizeof(a)/sizeof((a)[0]))
- 
--#define READ_SIZE	1024
- #define MAXTYPES	64
- #define MAXSLICES	256
- #define DM_TARGET	"linear"
-@@ -388,7 +388,7 @@ main(int argc, char **argv){
- 		set_delimiter(mapname, delim);
- 	}
- 
--	fd = open(device, O_RDONLY);
-+	fd = open(device, O_RDONLY | O_DIRECT);
- 
- 	if (fd == -1) {
- 		perror(device);
-@@ -690,9 +690,9 @@ xmalloc (size_t size) {
-  */
- 
- static int
--sseek(int fd, unsigned int secnr) {
-+sseek(int fd, unsigned int secnr, int secsz) {
- 	off64_t in, out;
--	in = ((off64_t) secnr << 9);
-+	in = ((off64_t) secnr * secsz);
- 	out = 1;
- 
- 	if ((out = lseek64(fd, in, SEEK_SET)) != in)
-@@ -703,6 +703,31 @@ sseek(int fd, unsigned int secnr) {
- 	return 0;
- }
- 
-+int
-+aligned_malloc(void **mem_p, size_t align, size_t *size_p)
-+{
-+	static size_t pgsize = 0;
-+	size_t size;
-+	int err;
-+
-+	if (!mem_p || !align || (size_p && !*size_p))
-+		return EINVAL;
-+
-+	if (!pgsize)
-+		pgsize = getpagesize();
-+
-+	if (size_p)
-+		size = ((*size_p + align - 1) / align) * align;
-+	else
-+		size = pgsize;
-+
-+	err = posix_memalign(mem_p, pgsize, size);
-+	if (!err && size_p)
-+		*size_p = size;
-+	return err;
-+}
-+
-+/* always in sector size blocks */
- static
- struct block {
- 	unsigned int secnr;
-@@ -710,30 +735,39 @@ struct block {
- 	struct block *next;
- } *blockhead;
- 
-+/* blknr is always in 512 byte blocks */
- char *
--getblock (int fd, unsigned int secnr) {
-+getblock (int fd, unsigned int blknr) {
-+	unsigned int secsz = get_sector_size(fd);
-+	unsigned int blks_per_sec = secsz / 512;
-+	unsigned int secnr = blknr / blks_per_sec;
-+	unsigned int blk_off = (blknr % blks_per_sec) * 512;
- 	struct block *bp;
- 
- 	for (bp = blockhead; bp; bp = bp->next)
- 
- 		if (bp->secnr == secnr)
--			return bp->block;
-+			return bp->block + blk_off;
- 
--	if (sseek(fd, secnr))
-+	if (sseek(fd, secnr, secsz))
- 		return NULL;
- 
- 	bp = xmalloc(sizeof(struct block));
- 	bp->secnr = secnr;
- 	bp->next = blockhead;
- 	blockhead = bp;
--	bp->block = (char *) xmalloc(READ_SIZE);
-+	if (aligned_malloc((void **)&bp->block, secsz, NULL)) {
-+		fprintf(stderr, "aligned_malloc failed\n");
-+		exit(1);
-+	}
- 
--	if (read(fd, bp->block, READ_SIZE) != READ_SIZE) {
-+	if (read(fd, bp->block, secsz) != secsz) {
- 		fprintf(stderr, "read error, sector %d\n", secnr);
--		bp->block = NULL;
-+		blockhead = bp->next;
-+		return NULL;
- 	}
- 
--	return bp->block;
-+	return bp->block + blk_off;
- }
- 
- int
-diff --git a/kpartx/kpartx.h b/kpartx/kpartx.h
-index 67edeb82..727632c1 100644
---- a/kpartx/kpartx.h
-+++ b/kpartx/kpartx.h
-@@ -1,6 +1,7 @@
- #ifndef _KPARTX_H
- #define _KPARTX_H
- 
-+#include <stddef.h>
- #include <stdint.h>
- #include <sys/ioctl.h>
- 
-@@ -61,6 +62,7 @@ extern ptreader read_mac_pt;
- extern ptreader read_sun_pt;
- extern ptreader read_ps3_pt;
- 
-+int aligned_malloc(void **mem_p, size_t align, size_t *size_p);
- char *getblock(int fd, unsigned int secnr);
- 
- static inline unsigned int
--- 
-2.17.2
-

SOURCES/0032-libmultipath-don-t-return-error-on-invalid-values.patch

@@ -14,19 +14,19 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  1 file changed, 25 insertions(+), 39 deletions(-)
 
 diff --git a/libmultipath/dict.c b/libmultipath/dict.c
-index b255322e..5a0255b0 100644
+index c534d703..1b75be47 100644
 --- a/libmultipath/dict.c
 +++ b/libmultipath/dict.c
-@@ -29,7 +29,7 @@
+@@ -30,7 +30,7 @@
- #include "mpath_cmd.h"
  #include "dict.h"
+ #include "strbuf.h"
  
 -static int
 +static void
  do_set_int(vector strvec, void *ptr, int min, int max, const char *file,
  	int line_nr, char *buff)
  {
-@@ -44,7 +44,7 @@ do_set_int(vector strvec, void *ptr, int min, int max, const char *file,
+@@ -45,7 +45,7 @@ do_set_int(vector strvec, void *ptr, int min, int max, const char *file,
  	if (*buff == '\0' || *eptr != '\0') {
  		condlog(1, "%s line %d, invalid value for %s: \"%s\"",
  			file, line_nr, (char*)VECTOR_SLOT(strvec, 0), buff);
@@ -35,7 +35,7 @@ index b255322e..5a0255b0 100644
  	}
  	if (res > max || res < min) {
  		res = (res > max) ? max : min;
-@@ -53,7 +53,7 @@ do_set_int(vector strvec, void *ptr, int min, int max, const char *file,
+@@ -54,7 +54,7 @@ do_set_int(vector strvec, void *ptr, int min, int max, const char *file,
  		(res == max)? "large" : "small", res);
  	}
  	*int_ptr = res;
@@ -44,7 +44,7 @@ index b255322e..5a0255b0 100644
  }
  
  static int
-@@ -61,16 +61,15 @@ set_int(vector strvec, void *ptr, int min, int max, const char *file,
+@@ -62,16 +62,15 @@ set_int(vector strvec, void *ptr, int min, int max, const char *file,
  	int line_nr)
  {
  	char *buff;
@@ -63,7 +63,7 @@ index b255322e..5a0255b0 100644
  }
  
  static int
-@@ -79,7 +78,6 @@ set_uint(vector strvec, void *ptr, const char *file, int line_nr)
+@@ -80,7 +79,6 @@ set_uint(vector strvec, void *ptr, const char *file, int line_nr)
  	unsigned int *uint_ptr = (unsigned int *)ptr;
  	char *buff, *eptr, *p;
  	unsigned long res;
@@ -71,7 +71,7 @@ index b255322e..5a0255b0 100644
  
  	buff = set_value(strvec);
  	if (!buff)
-@@ -92,17 +90,14 @@ set_uint(vector strvec, void *ptr, const char *file, int line_nr)
+@@ -93,17 +91,14 @@ set_uint(vector strvec, void *ptr, const char *file, int line_nr)
  	if (eptr > buff)
  		while (isspace(*eptr))
  			eptr++;
@@ -92,7 +92,7 @@ index b255322e..5a0255b0 100644
  }
  
  static int
-@@ -990,7 +985,6 @@ declare_mp_attr_snprint(gid, print_gid)
+@@ -954,7 +949,6 @@ declare_mp_attr_snprint(gid, print_gid)
  static int
  set_undef_off_zero(vector strvec, void *ptr, const char *file, int line_nr)
  {
@@ -100,7 +100,7 @@ index b255322e..5a0255b0 100644
  	char * buff;
  	int *int_ptr = (int *)ptr;
  
-@@ -1000,11 +994,10 @@ set_undef_off_zero(vector strvec, void *ptr, const char *file, int line_nr)
+@@ -964,11 +958,10 @@ set_undef_off_zero(vector strvec, void *ptr, const char *file, int line_nr)
  
  	if (strcmp(buff, "off") == 0)
  		*int_ptr = UOZ_OFF;
@@ -115,7 +115,7 @@ index b255322e..5a0255b0 100644
  
  	FREE(buff);
  	return 0;
-@@ -1151,28 +1144,24 @@ max_fds_handler(struct config *conf, vector strvec, const char *file,
+@@ -1114,28 +1107,24 @@ max_fds_handler(struct config *conf, vector strvec, const char *file,
  		int line_nr)
  {
  	char * buff;
@@ -152,7 +152,7 @@ index b255322e..5a0255b0 100644
  }
  
  static int
-@@ -1238,7 +1227,6 @@ declare_mp_snprint(rr_weight, print_rr_weight)
+@@ -1201,7 +1190,6 @@ declare_mp_snprint(rr_weight, print_rr_weight)
  static int
  set_pgfailback(vector strvec, void *ptr, const char *file, int line_nr)
  {
@@ -160,7 +160,7 @@ index b255322e..5a0255b0 100644
  	int *int_ptr = (int *)ptr;
  	char * buff;
  
-@@ -1253,11 +1241,11 @@ set_pgfailback(vector strvec, void *ptr, const char *file, int line_nr)
+@@ -1216,11 +1204,11 @@ set_pgfailback(vector strvec, void *ptr, const char *file, int line_nr)
  	else if (strlen(buff) == 10 && !strcmp(buff, "followover"))
  		*int_ptr = -FAILBACK_FOLLOWOVER;
  	else
@@ -174,7 +174,7 @@ index b255322e..5a0255b0 100644
  }
  
  int
-@@ -1289,7 +1277,6 @@ declare_mp_snprint(pgfailback, print_pgfailback)
+@@ -1252,7 +1240,6 @@ declare_mp_snprint(pgfailback, print_pgfailback)
  static int
  no_path_retry_helper(vector strvec, void *ptr, const char *file, int line_nr)
  {
@@ -182,7 +182,7 @@ index b255322e..5a0255b0 100644
  	int *int_ptr = (int *)ptr;
  	char * buff;
  
-@@ -1302,10 +1289,10 @@ no_path_retry_helper(vector strvec, void *ptr, const char *file, int line_nr)
+@@ -1265,10 +1252,10 @@ no_path_retry_helper(vector strvec, void *ptr, const char *file, int line_nr)
  	else if (!strcmp(buff, "queue"))
  		*int_ptr = NO_PATH_RETRY_QUEUE;
  	else
@@ -195,7 +195,7 @@ index b255322e..5a0255b0 100644
  }
  
  int
-@@ -1453,7 +1440,6 @@ snprint_mp_reservation_key (struct config *conf, char * buff, int len,
+@@ -1413,7 +1400,6 @@ snprint_mp_reservation_key (struct config *conf, struct strbuf *buff,
  static int
  set_off_int_undef(vector strvec, void *ptr, const char *file, int line_nr)
  {
@@ -203,7 +203,7 @@ index b255322e..5a0255b0 100644
  	int *int_ptr = (int *)ptr;
  	char * buff;
  
-@@ -1464,10 +1450,10 @@ set_off_int_undef(vector strvec, void *ptr, const char *file, int line_nr)
+@@ -1424,10 +1410,10 @@ set_off_int_undef(vector strvec, void *ptr, const char *file, int line_nr)
  	if (!strcmp(buff, "no") || !strcmp(buff, "0"))
  		*int_ptr = NU_NO;
  	else

SOURCES/0033-kpartx-handle-alternate-bsd-disklabel-location.patch

@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Tue, 30 Jun 2020 10:49:59 -0500
-Subject: [PATCH] kpartx: handle alternate bsd disklabel location
-
-bsd disk labels can either be at the start of the second sector, or 64
-bytes into the first sector, but kpartx only handled the first case.
-However the second case is what parted creates, and what the linux
-kernel partition code expects.  kpartx should handle both cases.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- kpartx/bsd.c | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/kpartx/bsd.c b/kpartx/bsd.c
-index 0e661fbc..950b0f92 100644
---- a/kpartx/bsd.c
-+++ b/kpartx/bsd.c
-@@ -1,6 +1,7 @@
- #include "kpartx.h"
- #include <stdio.h>
- 
-+#define BSD_LABEL_OFFSET	64
- #define BSD_DISKMAGIC	(0x82564557UL)	/* The disk magic number */
- #define XBSD_MAXPARTITIONS	16
- #define BSD_FS_UNUSED		0
-@@ -60,8 +61,19 @@ read_bsd_pt(int fd, struct slice all, struct slice *sp, unsigned int ns) {
- 		return -1;
- 
- 	l = (struct bsd_disklabel *) bp;
--	if (l->d_magic != BSD_DISKMAGIC)
--		return -1;
-+	if (l->d_magic != BSD_DISKMAGIC) {
-+		/*
-+		 * BSD disklabels can also start 64 bytes offset from the
-+		 * start of the first sector
-+		 */
-+		bp = getblock(fd, offset);
-+		if (bp == NULL)
-+			return -1;
-+
-+		l = (struct bsd_disklabel *)(bp + 64);
-+		if (l->d_magic != BSD_DISKMAGIC)
-+			return -1;
-+	}
- 
- 	max_partitions = 16;
- 	if (l->d_npartitions < max_partitions)
--- 
-2.17.2
-

SOURCES/0033-multipathd-avoid-unnecessary-path-read-only-reloads.patch

@@ -14,13 +14,27 @@ device from read-only to read/write.
 
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
+ libmultipath/libmultipath.version |  5 +++++
  libmultipath/sysfs.c              | 22 ++++++++++++++++++++++
  libmultipath/sysfs.h              |  1 +
  multipathd/main.c                 | 31 ++++++++++++++++++++++++++++++-
- 3 files changed, 53 insertions(+), 1 deletion(-)
+ 4 files changed, 58 insertions(+), 1 deletion(-)
 
+diff --git a/libmultipath/libmultipath.version b/libmultipath/libmultipath.version
+index eb5b5b55..dd1b4122 100644
+--- a/libmultipath/libmultipath.version
++++ b/libmultipath/libmultipath.version
+@@ -287,3 +287,8 @@ global:
+ local:
+ 	*;
+ };
++
++LIBMULTIPATH_9.1.0 {
++global:
++	sysfs_get_ro;
++} LIBMULTIPATH_9.0.0;
 diff --git a/libmultipath/sysfs.c b/libmultipath/sysfs.c
-index 62ec2ed7..a57bd60e 100644
+index 9ff145f2..24c12b6a 100644
 --- a/libmultipath/sysfs.c
 +++ b/libmultipath/sysfs.c
 @@ -236,6 +236,28 @@ sysfs_get_size (struct path *pp, unsigned long long * size)
@@ -53,7 +67,7 @@ index 62ec2ed7..a57bd60e 100644
  {
  	unsigned int major, new_minor, table_minor;
 diff --git a/libmultipath/sysfs.h b/libmultipath/sysfs.h
-index 9ae30b39..91092e44 100644
+index 72b39ab2..c948c467 100644
 --- a/libmultipath/sysfs.h
 +++ b/libmultipath/sysfs.h
 @@ -13,6 +13,7 @@ ssize_t sysfs_attr_get_value(struct udev_device *dev, const char *attr_name,
@@ -62,14 +76,14 @@ index 9ae30b39..91092e44 100644
  int sysfs_get_size (struct path *pp, unsigned long long * size);
 +int sysfs_get_ro(struct path *pp);
  int sysfs_check_holders(char * check_devt, char * new_devt);
- bool sysfs_is_multipathed(const struct path *pp);
+ bool sysfs_is_multipathed(struct path *pp, bool set_wwid);
  #endif
 diff --git a/multipathd/main.c b/multipathd/main.c
-index 823b53a2..e2b9d546 100644
+index 1defeaf1..6145e512 100644
 --- a/multipathd/main.c
 +++ b/multipathd/main.c
-@@ -1256,6 +1256,35 @@ fail:
+@@ -1324,6 +1324,35 @@ fail:
- 	return PATH_REMOVE_FAILED;
+ 	return REMOVE_PATH_MAP_ERROR;
  }
  
 +static bool
@@ -104,7 +118,7 @@ index 823b53a2..e2b9d546 100644
  static int
  uev_update_path (struct uevent *uev, struct vectors * vecs)
  {
-@@ -1321,7 +1350,7 @@ uev_update_path (struct uevent *uev, struct vectors * vecs)
+@@ -1388,7 +1417,7 @@ uev_update_path (struct uevent *uev, struct vectors * vecs)
  		}
  
  		ro = uevent_get_disk_ro(uev);

SOURCES/0034-libmultipath-fix-checker-detection-for-nvme-devices.patch

@@ -1,61 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Tue, 30 Jun 2020 13:59:13 -0500
-Subject: [PATCH] libmultipath: fix checker detection for nvme devices
-
-In order to fix hwhandler autodetection, commit 8794a776 made
-detect_alua() differentiate between failures to detect whether alua was
-supported, and successfully detecting that it was not supported.
-However, this causes nvme devices to get the TUR checker assigned to
-them. This is because there is nothing in detect_alua() to make it only
-work on scsi devices, and select_checker wasn't updated to handle
-detect_alua() failing without setting pp->tpgs to TPGS_NONE.
-
-detect_alua() should automatically set pp->tpgs to TPGS_NONE and exit on
-non-scsi devices. Also, select_checker() should not assume that a
-devices is ALUA, simply because if failed to detect if alua was
-supported.
-
-Fixes: 8794a776 "libmultipath: fix ALUA autodetection when paths are
-                 down"
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/discovery.c | 6 ++++++
- libmultipath/propsel.c   | 4 +++-
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
-index 83a41a4a..aa5942c3 100644
---- a/libmultipath/discovery.c
-+++ b/libmultipath/discovery.c
-@@ -887,6 +887,12 @@ detect_alua(struct path * pp)
- 	int tpgs;
- 	unsigned int timeout;
- 
-+
-+	if (pp->bus != SYSFS_BUS_SCSI) {
-+		pp->tpgs = TPGS_NONE;
-+		return;
-+	}
-+
- 	if (sysfs_get_timeout(pp, &timeout) <= 0)
- 		timeout = DEF_TIMEOUT;
- 
-diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
-index 897e48ca..d362beb4 100644
---- a/libmultipath/propsel.c
-+++ b/libmultipath/propsel.c
-@@ -521,7 +521,9 @@ int select_checker(struct config *conf, struct path *pp)
- 		if (check_rdac(pp)) {
- 			ckr_name = RDAC;
- 			goto out;
--		} else if (path_get_tpgs(pp) != TPGS_NONE) {
-+		}
-+		path_get_tpgs(pp);
-+		if (pp->tpgs != TPGS_NONE && pp->tpgs != TPGS_UNDEF) {
- 			ckr_name = TUR;
- 			goto out;
- 		}
--- 
-2.17.2
-

SOURCES/0034-multipath-fix-exit-status-of-multipath-T.patch

@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martin Wilck <mwilck@suse.com>
+Date: Fri, 22 Oct 2021 12:58:11 +0200
+Subject: [PATCH] multipath: fix exit status of multipath -T
+
+We must set the return value in configure().
+
+Signed-off-by: Martin Wilck <mwilck@suse.com>
+Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ multipath/main.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/multipath/main.c b/multipath/main.c
+index 748e7902..80fa68e5 100644
+--- a/multipath/main.c
++++ b/multipath/main.c
+@@ -606,6 +606,7 @@ configure (struct config *conf, enum mpath_cmds cmd,
+ 
+ 		dump_config(conf, hwes, curmp);
+ 		vector_free(hwes);
++		r = RTVL_OK;
+ 		goto out;
+ 	}
+ 

SOURCES/0035-Makefile.inc-trim-extra-information-from-systemd-ver.patch

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Mon, 6 Jul 2020 13:21:12 -0500
-Subject: [PATCH] Makefile.inc: trim extra information from systemd version
-
-Some systemd versions print extra information in the
-"pkg-config --modversion" output, which confuses make. Trim this
-off.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- Makefile.inc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.inc b/Makefile.inc
-index c2abd301..220009e0 100644
---- a/Makefile.inc
-+++ b/Makefile.inc
-@@ -37,7 +37,7 @@ endif
- 
- ifndef SYSTEMD
- 	ifeq ($(shell pkg-config --modversion libsystemd >/dev/null 2>&1 && echo 1), 1)
--		SYSTEMD = $(shell pkg-config --modversion libsystemd)
-+		SYSTEMD = $(shell pkg-config --modversion libsystemd | awk '{print $$1}')
- 	else
- 		ifeq ($(shell systemctl --version >/dev/null 2>&1 && echo 1), 1)
- 			SYSTEMD = $(shell systemctl --version 2> /dev/null | \
--- 
-2.17.2
-

SOURCES/0035-RH-mpathconf-fix-setting-property_blacklist.patch

@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Benjamin Marzinski <bmarzins@redhat.com>
+Date: Mon, 13 Dec 2021 14:26:30 -0600
+Subject: [PATCH] RH: mpathconf: fix setting property_blacklist
+
+If there was no blacklist_exceptions section, setting property_blacklist
+didn't work correctly. Fix it.
+
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ multipath/mpathconf | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/multipath/mpathconf b/multipath/mpathconf
+index c00d2555..0de6b121 100644
+--- a/multipath/mpathconf
++++ b/multipath/mpathconf
+@@ -496,7 +496,15 @@ if [ "$PROPERTY" = "n" ]; then
+ 		CHANGED_CONFIG=1
+ 	fi
+ elif [ "$PROPERTY" = "y" ]; then
+-	if [ -z "$HAVE_PROPERTY" ]; then
++	if [ -z "$HAVE_PROPERTY" -a -z "$HAVE_EXCEPTIONS" ]; then
++		cat >> $TMPFILE << _EOF_
++
++blacklist_exceptions {
++	property "(SCSI_IDENT_|ID_WWN)"
++}
++_EOF_
++		CHANGED_CONFIG=1
++	elif [ -z "$HAVE_PROPERTY" ]; then
+ 		sed -i '/^blacklist_exceptions[[:space:]]*{/ a\
+ 	property "(SCSI_IDENT_|ID_WWN)"
+ ' $TMPFILE

SOURCES/0036-kpartx-fix-Wsign-compare-error.patch

@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Mon, 6 Jul 2020 17:28:46 -0500
-Subject: [PATCH] kpartx: fix -Wsign-compare error
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- kpartx/kpartx.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c
-index c24ad6d9..653ce0c8 100644
---- a/kpartx/kpartx.c
-+++ b/kpartx/kpartx.c
-@@ -738,7 +738,7 @@ struct block {
- /* blknr is always in 512 byte blocks */
- char *
- getblock (int fd, unsigned int blknr) {
--	unsigned int secsz = get_sector_size(fd);
-+	int secsz = get_sector_size(fd);
- 	unsigned int blks_per_sec = secsz / 512;
- 	unsigned int secnr = blknr / blks_per_sec;
- 	unsigned int blk_off = (blknr % blks_per_sec) * 512;
--- 
-2.17.2
-

SOURCES/0036-libmultipath-fix-disassemble-status-for-historical-s.patch

@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Benjamin Marzinski <bmarzins@redhat.com>
+Date: Wed, 12 Jan 2022 12:26:12 -0600
+Subject: [PATCH] libmultipath: fix disassemble status for
+ historical-service-time PS
+
+The historical-service-time path selector prints out 2 path group status
+arguments. This is the only path selector that uses the group status
+arguments. All the others only have path status arguments.
+disassemble_status() was expecting the number of group status arguments
+to always be zero, causing it to fail at disassembling the status of
+devices that use historical-service-time path selector. Now multipath
+actually checks the number of group arguments, and skips them.
+
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ libmultipath/dmparser.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/libmultipath/dmparser.c b/libmultipath/dmparser.c
+index 4ba7f339..bc311421 100644
+--- a/libmultipath/dmparser.c
++++ b/libmultipath/dmparser.c
+@@ -437,9 +437,19 @@ int disassemble_status(const char *params, struct multipath *mpp)
+ 		FREE(word);
+ 
+ 		/*
+-		 * PG Status (discarded, would be '0' anyway)
++		 * Path Selector Group Arguments
+ 		 */
+-		p += get_word(p, NULL);
++		p += get_word(p, &word);
++
++		if (!word)
++			return 1;
++
++		num_pg_args = atoi(word);
++		free(word);
++
++		/* Ignore ps group arguments */
++		for (j = 0; j < num_pg_args; j++)
++			p += get_word(p, NULL);
+ 
+ 		p += get_word(p, &word);
+ 

SOURCES/0037-libmultipath-count-pending-paths-as-active-on-loads.patch

@@ -1,86 +0,0 @@
-From 7159242be31dbb3f25aa67920462107bc2bc5fe0 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Thu, 9 Jul 2020 18:20:18 -0500
-Subject: [PATCH] libmultipath: count pending paths as active on loads
-
-When multipath loads a table, it signals to udev if there are no active
-paths.  Multipath wasn't counting pending paths as active.  This meant
-that if all the paths were pending, udev would treat the device as not
-ready, and not run kpartx on it.  Even if the pending paths later
-because active and were reinstated, the kernel would not send a new
-uevent, because from its point of view, they were always up.
-
-The alternative would be to continue to treat them as failed in the udev
-rules, but then also tell the kernel that they were down, so that it
-would trigger a uevent when they were reinstated. However, this could
-lead to newly created multipath devices failing IO, simply because the
-path checkers hadn't returned yet. Having udev assume that the the
-device is up, like the kernel does, seems like the safer option.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/devmapper.c |  3 ++-
- libmultipath/structs.c   | 20 ++++++++++++++++++++
- libmultipath/structs.h   |  1 +
- 3 files changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
-index 7f98bf9d..91ff0b3d 100644
---- a/libmultipath/devmapper.c
-+++ b/libmultipath/devmapper.c
-@@ -408,7 +408,8 @@ static uint16_t build_udev_flags(const struct multipath *mpp, int reload)
- 	/* DM_UDEV_DISABLE_LIBRARY_FALLBACK is added in dm_addmap */
- 	return	(mpp->skip_kpartx == SKIP_KPARTX_ON ?
- 		 MPATH_UDEV_NO_KPARTX_FLAG : 0) |
--		((count_active_paths(mpp) == 0 || mpp->ghost_delay_tick > 0) ?
-+		((count_active_pending_paths(mpp) == 0 ||
-+		  mpp->ghost_delay_tick > 0) ?
- 		 MPATH_UDEV_NO_PATHS_FLAG : 0) |
- 		(reload && !mpp->force_udev_reload ?
- 		 MPATH_UDEV_RELOAD_FLAG : 0);
-diff --git a/libmultipath/structs.c b/libmultipath/structs.c
-index 2dd378c4..dda9884c 100644
---- a/libmultipath/structs.c
-+++ b/libmultipath/structs.c
-@@ -500,6 +500,26 @@ int count_active_paths(const struct multipath *mpp)
- 	return count;
- }
- 
-+int count_active_pending_paths(const struct multipath *mpp)
-+{
-+	struct pathgroup *pgp;
-+	struct path *pp;
-+	int count = 0;
-+	int i, j;
-+
-+	if (!mpp->pg)
-+		return 0;
-+
-+	vector_foreach_slot (mpp->pg, pgp, i) {
-+		vector_foreach_slot (pgp->paths, pp, j) {
-+			if (pp->state == PATH_UP || pp->state == PATH_GHOST ||
-+			    pp->state == PATH_PENDING)
-+				count++;
-+		}
-+	}
-+	return count;
-+}
-+
- int pathcmp(const struct pathgroup *pgp, const struct pathgroup *cpgp)
- {
- 	int i, j;
-diff --git a/libmultipath/structs.h b/libmultipath/structs.h
-index 9bd39eb1..8e78b8c0 100644
---- a/libmultipath/structs.h
-+++ b/libmultipath/structs.h
-@@ -465,6 +465,7 @@ struct path * first_path (const struct multipath *mpp);
- int pathcountgr (const struct pathgroup *, int);
- int pathcount (const struct multipath *, int);
- int count_active_paths(const struct multipath *);
-+int count_active_pending_paths(const struct multipath *);
- int pathcmp (const struct pathgroup *, const struct pathgroup *);
- int add_feature (char **, const char *);
- int remove_feature (char **, const char *);
--- 
-2.17.2
-

SOURCES/0037-libmultipath-make-helper-function-to-trigger-path-ue.patch

@@ -15,10 +15,10 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  2 files changed, 43 insertions(+), 37 deletions(-)
 
 diff --git a/libmultipath/configure.c b/libmultipath/configure.c
-index 9c8d3e34..9a9890f5 100644
+index 7edb355b..043e4232 100644
 --- a/libmultipath/configure.c
 +++ b/libmultipath/configure.c
-@@ -545,11 +545,8 @@ unref:
+@@ -565,11 +565,8 @@ unref:
  }
  
  void
@@ -31,7 +31,7 @@ index 9c8d3e34..9a9890f5 100644
  	/*
  	 * If a path changes from multipath to non-multipath, we must
  	 * synthesize an artificial "add" event, otherwise the LVM2 rules
-@@ -557,6 +554,45 @@ trigger_paths_udev_change(struct multipath *mpp, bool is_mpath)
+@@ -577,6 +574,45 @@ trigger_paths_udev_change(struct multipath *mpp, bool is_mpath)
  	 * irritate ourselves with an "add", so use "change".
  	 */
  	const char *action = is_mpath ? "change" : "add";
@@ -77,7 +77,7 @@ index 9c8d3e34..9a9890f5 100644
  
  	if (!mpp || !mpp->pg)
  		return;
-@@ -564,39 +600,8 @@ trigger_paths_udev_change(struct multipath *mpp, bool is_mpath)
+@@ -584,39 +620,8 @@ trigger_paths_udev_change(struct multipath *mpp, bool is_mpath)
  	vector_foreach_slot (mpp->pg, pgp, i) {
  		if (!pgp->paths)
  			continue;
@@ -120,12 +120,12 @@ index 9c8d3e34..9a9890f5 100644
  
  	mpp->needs_paths_uevent = 0;
 diff --git a/libmultipath/configure.h b/libmultipath/configure.h
-index 8a266d31..5cf08d45 100644
+index efe18b7d..2bf73e65 100644
 --- a/libmultipath/configure.h
 +++ b/libmultipath/configure.h
-@@ -56,6 +56,7 @@ int get_refwwid (enum mpath_cmds cmd, char * dev, enum devtypes dev_type,
+@@ -56,6 +56,7 @@ int coalesce_paths (struct vectors *vecs, vector curmp, char * refwwid, int forc
+ int get_refwwid (enum mpath_cmds cmd, const char *dev, enum devtypes dev_type,
  		 vector pathvec, char **wwid);
- int reload_map(struct vectors *vecs, struct multipath *mpp, int refresh, int is_daemon);
  struct udev_device *get_udev_device(const char *dev, enum devtypes dev_type);
 +void trigger_path_udev_change(struct path *pp, bool is_mpath);
  void trigger_paths_udev_change(struct multipath *mpp, bool is_mpath);

SOURCES/0038-multipath-deal-with-failures-flushing-maps.patch

@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Mon, 13 Jul 2020 15:41:15 -0500
-Subject: [PATCH] multipath: deal with failures flushing maps
-
-dm_flush_maps() was failing if there were no device-mapper devices at
-all, instead of returning success, since there is nothing to do.
-
-delegate_to_multipathd() was returning success, even if the multipathd
-command failed. Also, if the command was set to fail with NOT_DELEGATED,
-it shouldn't print any errors, since multipath will try to issue to
-command itself.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/devmapper.c | 2 +-
- multipath/main.c         | 9 ++++++---
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
-index 91ff0b3d..3f70e576 100644
---- a/libmultipath/devmapper.c
-+++ b/libmultipath/devmapper.c
-@@ -970,10 +970,10 @@ int dm_flush_maps (int need_suspend, int retries)
- 	if (!(names = dm_task_get_names (dmt)))
- 		goto out;
- 
-+	r = 0;
- 	if (!names->dev)
- 		goto out;
- 
--	r = 0;
- 	do {
- 		if (need_suspend)
- 			r |= dm_suspend_and_flush_map(names->name, retries);
-diff --git a/multipath/main.c b/multipath/main.c
-index 3c3d2398..607cada2 100644
---- a/multipath/main.c
-+++ b/multipath/main.c
-@@ -869,9 +869,12 @@ int delegate_to_multipathd(enum mpath_cmds cmd,
- 		goto out;
- 	}
- 
--	if (reply != NULL && *reply != '\0' && strcmp(reply, "ok\n"))
--		printf("%s", reply);
--	r = DELEGATE_OK;
-+	if (reply != NULL && *reply != '\0') {
-+		if (strcmp(reply, "fail\n"))
-+			r = DELEGATE_OK;
-+		if (r != NOT_DELEGATED && strcmp(reply, "ok\n"))
-+			printf("%s", reply);
-+	}
- 
- out:
- 	FREE(reply);
--- 
-2.17.2
-

SOURCES/0038-multipathd-trigger-udev-change-on-path-addition.patch

@@ -22,14 +22,28 @@ claimed by multipath, and if not, triggers a uevent to claim it.
 
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
+ libmultipath/libmultipath.version | 5 +++++
  multipathd/main.c                 | 2 ++
- 1 file changed, 2 insertions(+)
+ 2 files changed, 7 insertions(+)
 
+diff --git a/libmultipath/libmultipath.version b/libmultipath/libmultipath.version
+index dd1b4122..0d89e9e1 100644
+--- a/libmultipath/libmultipath.version
++++ b/libmultipath/libmultipath.version
+@@ -292,3 +292,8 @@ LIBMULTIPATH_9.1.0 {
+ global:
+ 	sysfs_get_ro;
+ } LIBMULTIPATH_9.0.0;
++
++LIBMULTIPATH_9.1.1 {
++global:
++	trigger_path_udev_change;
++} LIBMULTIPATH_9.1.0;
 diff --git a/multipathd/main.c b/multipathd/main.c
-index e2b9d546..f4b79882 100644
+index 6145e512..5def5301 100644
 --- a/multipathd/main.c
 +++ b/multipathd/main.c
-@@ -1005,6 +1005,8 @@ ev_add_path (struct path * pp, struct vectors * vecs, int need_do_map)
+@@ -1062,6 +1062,8 @@ ev_add_path (struct path * pp, struct vectors * vecs, int need_do_map)
  		free_path(pp);
  		return 1;
  	}

SOURCES/0039-RH-add-support-to-mpathconf-for-setting-arbitrary-de.patch

@@ -14,7 +14,7 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  2 files changed, 62 insertions(+), 3 deletions(-)
 
 diff --git a/multipath/mpathconf b/multipath/mpathconf
-index 5f2285ab..870512c0 100644
+index 0de6b121..6e33fb99 100644
 --- a/multipath/mpathconf
 +++ b/multipath/mpathconf
 @@ -17,7 +17,7 @@
@@ -26,15 +26,15 @@ index 5f2285ab..870512c0 100644
  
  DEFAULT_CONFIG="# device-mapper-multipath configuration file
  
-@@ -57,6 +57,7 @@ function usage
+@@ -52,6 +52,7 @@ function usage
  	echo "Set find_multipaths (Default y): --find_multipaths <yes|no|strict|greedy|smart>"
- 	echo "Set default property blacklist (Default y): --property_blacklist <y|n>"
+ 	echo "Set default property blacklist (Default n): --property_blacklist <y|n>"
  	echo "Set enable_foreign to show foreign devices (Default n): --enable_foreign <y|n>"
 +	echo "Add/Change/Remove option in defaults section: --option <option_name>:<value>"
  	echo "Load the dm-multipath modules on enable (Default y): --with_module <y|n>"
  	echo "start/stop/reload multipathd (Default n): --with_multipathd <y|n>"
  	echo "select output file (Default /etc/multipath.conf): --outfile <FILE>"
-@@ -167,6 +168,20 @@ function parse_args
+@@ -162,6 +163,20 @@ function parse_args
  					exit 1
  				fi
  				;;
@@ -55,7 +55,7 @@ index 5f2285ab..870512c0 100644
  			--enable_foreign)
  				if [ -n "$2" ]; then
  					FOREIGN=$2
-@@ -213,12 +228,15 @@ function parse_args
+@@ -208,12 +223,15 @@ function parse_args
  
  function validate_args
  {
@@ -72,7 +72,7 @@ index 5f2285ab..870512c0 100644
  	fi
  	if [ -n "$FRIENDLY" ] && [ "$FRIENDLY" != "y" -a "$FRIENDLY" != "n" ]; then
  		echo "--user_friendly_names must be either 'y' or 'n'"
-@@ -240,7 +258,19 @@ function validate_args
+@@ -235,7 +253,19 @@ function validate_args
  		echo "--enable_foreign must be either 'y' or 'n'"
  		exit 1
  	fi
@@ -93,9 +93,9 @@ index 5f2285ab..870512c0 100644
  		SHOW_STATUS=1
  	fi
  	if [ -n "$MODULE" ] && [ "$MODULE" != "y" -a "$MODULE" != "n" ]; then
-@@ -349,6 +379,13 @@ if [ "$HAVE_DEFAULTS" = "1" ]; then
+@@ -348,6 +378,13 @@ if [ "$HAVE_DEFAULTS" = "1" ]; then
  	elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*enable_foreign" ; then
- 		HAVE_FOREIGN=2
+ 		HAVE_FOREIGN=3
  	fi
 +	if [ -n "$OPTION_NAME" ]; then
 +		if sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q '^[[:space:]]*'"$OPTION_NAME"'[[:space:]][[:space:]]*'"$OPTION_VALUE" ; then
@@ -107,7 +107,7 @@ index 5f2285ab..870512c0 100644
  fi
  
  if [ "$HAVE_EXCEPTIONS" = "1" ]; then
-@@ -523,6 +560,21 @@ elif [ "$FOREIGN" = "n" ]; then
+@@ -532,6 +569,21 @@ elif [ "$FOREIGN" = "y" ]; then
  	fi
  fi
  
@@ -130,11 +130,11 @@ index 5f2285ab..870512c0 100644
  	cp $OUTPUTFILE $OUTPUTFILE.old
  	if [ $? != 0 ]; then
 diff --git a/multipath/mpathconf.8 b/multipath/mpathconf.8
-index 83515eb4..63fe633e 100644
+index a14d831e..496383b7 100644
 --- a/multipath/mpathconf.8
 +++ b/multipath/mpathconf.8
 @@ -101,6 +101,13 @@ to the
- defaults section. if set to \fBy\fP, this removes the line, if present. This
+ defaults section. if set to \fBn\fP, this removes the line, if present. This
  command can be used along with any other command.
  .TP
 +.B --option \fB<option_name>:[<value>]\fP

SOURCES/0039-libmultipath-factor-out-code-to-get-vpd-page-data.patch

@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Tue, 3 Nov 2020 14:27:58 -0600
-Subject: [PATCH] libmultipath: factor out code to get vpd page data
-
-A future patch will reuse the code to get the vpd page data, so factor
-it out from get_vpd_sgio().
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/discovery.c | 19 +++++++++++++++----
- 1 file changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
-index aa5942c3..eb1e735d 100644
---- a/libmultipath/discovery.c
-+++ b/libmultipath/discovery.c
-@@ -1239,11 +1239,10 @@ get_vpd_sysfs (struct udev_device *parent, int pg, char * str, int maxlen)
- 	return len;
- }
- 
--int
--get_vpd_sgio (int fd, int pg, int vend_id, char * str, int maxlen)
-+static int
-+fetch_vpd_page(int fd, int pg, unsigned char *buff)
- {
--	int len, buff_len;
--	unsigned char buff[4096];
-+	int buff_len;
- 
- 	memset(buff, 0x0, 4096);
- 	if (sgio_get_vpd(buff, 4096, fd, pg) < 0) {
-@@ -1264,6 +1263,18 @@ get_vpd_sgio (int fd, int pg, int vend_id, char * str, int maxlen)
- 		condlog(3, "vpd pg%02x page truncated", pg);
- 		buff_len = 4096;
- 	}
-+	return buff_len;
-+}
-+
-+int
-+get_vpd_sgio (int fd, int pg, int vend_id, char * str, int maxlen)
-+{
-+	int len, buff_len;
-+	unsigned char buff[4096];
-+
-+	buff_len = fetch_vpd_page(fd, pg, buff);
-+	if (buff_len < 0)
-+		return buff_len;
- 	if (pg == 0x80)
- 		len = parse_vpd_pg80(buff, str, maxlen);
- 	else if (pg == 0x83)
--- 
-2.17.2
-

SOURCES/0040-RH-add-support-to-mpathconf-for-setting-recheck_wwid.patch

@@ -0,0 +1,154 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Benjamin Marzinski <bmarzins@redhat.com>
+Date: Thu, 3 Feb 2022 13:26:18 -0600
+Subject: [PATCH] RH: add support to mpathconf for setting recheck_wwid
+
+mpathconf now supports --recheck_wwid <y|n> for setthing the
+recheck_wwid option
+
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ multipath/mpathconf   | 48 ++++++++++++++++++++++++++++++++++++++++---
+ multipath/mpathconf.8 |  9 ++++++++
+ 2 files changed, 54 insertions(+), 3 deletions(-)
+
+diff --git a/multipath/mpathconf b/multipath/mpathconf
+index 6e33fb99..319664b1 100644
+--- a/multipath/mpathconf
++++ b/multipath/mpathconf
+@@ -17,7 +17,7 @@
+ # This program was largely ripped off from lvmconf
+ #
+ 
+-unset ENABLE FIND FRIENDLY PROPERTY FOREIGN MODULE MULTIPATHD HAVE_DISABLE HAVE_WWID_DISABLE HAVE_FIND HAVE_BLACKLIST HAVE_EXCEPTIONS HAVE_DEFAULTS HAVE_FRIENDLY HAVE_PROPERTY HAVE_FOREIGN HAVE_MULTIPATHD HAVE_MODULE HAVE_OUTFILE SHOW_STATUS CHANGED_CONFIG WWID_LIST HAVE_OPTION OPTION_NAME OPTION_VALUE
++unset ENABLE FIND FRIENDLY PROPERTY FOREIGN MODULE MULTIPATHD HAVE_DISABLE HAVE_WWID_DISABLE HAVE_FIND HAVE_BLACKLIST HAVE_EXCEPTIONS HAVE_DEFAULTS HAVE_FRIENDLY HAVE_PROPERTY HAVE_FOREIGN HAVE_MULTIPATHD HAVE_MODULE HAVE_OUTFILE SHOW_STATUS CHANGED_CONFIG WWID_LIST HAVE_OPTION OPTION_NAME OPTION_VALUE HAVE_RECHECK_WWID RECHECK_WWID
+ 
+ DEFAULT_CONFIG="# device-mapper-multipath configuration file
+ 
+@@ -52,6 +52,7 @@ function usage
+ 	echo "Set find_multipaths (Default y): --find_multipaths <yes|no|strict|greedy|smart>"
+ 	echo "Set default property blacklist (Default n): --property_blacklist <y|n>"
+ 	echo "Set enable_foreign to show foreign devices (Default n): --enable_foreign <y|n>"
++	echo "Set recheck_wwid (Defaut n): --recheck_wwid <y|n>"
+ 	echo "Add/Change/Remove option in defaults section: --option <option_name>:<value>"
+ 	echo "Load the dm-multipath modules on enable (Default y): --with_module <y|n>"
+ 	echo "start/stop/reload multipathd (Default n): --with_multipathd <y|n>"
+@@ -145,6 +146,15 @@ function parse_args
+ 					exit 1
+ 				fi
+ 				;;
++			--recheck_wwid)
++				if [ -n "$2" ]; then
++					RECHECK_WWID=$2
++					shift 2
++				else
++					usage
++					exit 1
++				fi
++				;;
+ 			--find_multipaths)
+ 				if [ -n "$2" ]; then
+ 					FIND=$2
+@@ -223,7 +233,7 @@ function parse_args
+ 
+ function validate_args
+ {
+-	if [ "$ENABLE" = "0" ] && [ -n "$FRIENDLY" -o -n "$FIND" -o -n "$PROPERTY" -o -n "$MODULE" -o -n "$FOREIGN" -o -n "$OPTION_NAME" ]; then
++	if [ "$ENABLE" = "0" ] && [ -n "$FRIENDLY" -o -n "$FIND" -o -n "$PROPERTY" -o -n "$MODULE" -o -n "$FOREIGN" -o -n "$OPTION_NAME" -o -n "$RECHECK_WWID" ]; then
+ 		echo "ignoring extra parameters on disable"
+ 		FRIENDLY=""
+ 		FIND=""
+@@ -232,11 +242,16 @@ function validate_args
+ 		FOREIGN=""
+ 		OPTION_NAME=""
+ 		OPTION_VALUE=""
++		RECHECK_WWID=""
+ 	fi
+ 	if [ -n "$FRIENDLY" ] && [ "$FRIENDLY" != "y" -a "$FRIENDLY" != "n" ]; then
+ 		echo "--user_friendly_names must be either 'y' or 'n'"
+ 		exit 1
+ 	fi
++	if [ -n "$RECHECK_WWID" ] && [ "$RECHECK_WWID" != "y" -a "$RECHECK_WWID" != "n" ]; then
++		echo "--recheck_wwid must be either 'y' or 'n'"
++		exit 1
++	fi
+ 	if [ "$FIND" = "y" ]; then
+ 		FIND="yes"
+ 	elif [ "$FIND" = "n" ]; then
+@@ -265,7 +280,7 @@ function validate_args
+ 			OPTION_VALUE=\"$OPTION_VALUE\"
+ 		fi
+ 	fi
+-	if [ -z "$ENABLE" -a -z "$FIND" -a -z "$FRIENDLY" -a -z "$PROPERTY" -a -z "$FOREIGN" -a -z "$OPTION_NAME" ]; then
++	if [ -z "$ENABLE" -a -z "$FIND" -a -z "$FRIENDLY" -a -z "$PROPERTY" -a -z "$FOREIGN" -a -z "$OPTION_NAME" -a -z "$RECHECK_WWID" ]; then
+ 		SHOW_STATUS=1
+ 	fi
+ 	if [ -n "$MODULE" ] && [ "$MODULE" != "y" -a "$MODULE" != "n" ]; then
+@@ -367,6 +382,11 @@ if [ "$HAVE_DEFAULTS" = "1" ]; then
+ 	elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*user_friendly_names[[:space:]][[:space:]]*\(no\|0\)" ; then
+ 		HAVE_FRIENDLY=0
+ 	fi
++	if sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*recheck_wwid[[:space:]][[:space:]]*\(yes\|1\)" ; then
++		HAVE_RECHECK_WWID=1
++	elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*recheck_wwid[[:space:]][[:space:]]*\(no\|0\)" ; then
++		HAVE_RECHECK_WWID=0
++	fi
+ 	if sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*#[[:space:]]*enable_foreign" ; then
+ 		HAVE_FOREIGN=0
+ 	elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*enable_foreign[[:space:]][[:space:]]*\"\.\*\"" ; then
+@@ -411,6 +431,11 @@ if [ -n "$SHOW_STATUS" ]; then
+ 	else
+ 		echo "user_friendly_names is enabled"
+ 	fi
++	if [ -z "$HAVE_RECHECK_WWID" -o "$HAVE_RECHECK_WWID" = 0 ]; then
++		echo "recheck_wwid is disabled"
++	else
++		echo "recheck_wwid is enabled"
++	fi
+ 	if [ -z "$HAVE_PROPERTY" -o "$HAVE_PROPERTY" = 0 ]; then
+ 		echo "default property blacklist is disabled"
+ 	else
+@@ -527,6 +552,23 @@ elif [ "$FRIENDLY" = "y" ]; then
+ 	fi
+ fi
+ 
++if [ "$RECHECK_WWID" = "n" ]; then
++	if [ "$HAVE_RECHECK_WWID" = 1 ]; then
++		sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*recheck_wwid[[:space:]][[:space:]]*\(yes\|1\)/	recheck_wwid no/' $TMPFILE
++		CHANGED_CONFIG=1
++	fi
++elif [ "$RECHECK_WWID" = "y" ]; then
++	if [ -z "$HAVE_RECHECK_WWID" ]; then
++		sed -i '/^defaults[[:space:]]*{/ a\
++	recheck_wwid yes
++' $TMPFILE
++		CHANGED_CONFIG=1
++	elif [ "$HAVE_RECHECK_WWID" = 0 ]; then
++		sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*recheck_wwid[[:space:]][[:space:]]*\(no\|0\)/	recheck_wwid yes/' $TMPFILE
++		CHANGED_CONFIG=1
++	fi
++fi
++
+ if [ "$PROPERTY" = "n" ]; then
+ 	if [ "$HAVE_PROPERTY" = 1 ]; then
+ 		sed -i '/^blacklist_exceptions[[:space:]]*{/,/^}/ s/^[[:space:]]*property[[:space:]][[:space:]]*\"(SCSI_IDENT_|ID_WWN)\"/#	property \"(SCSI_IDENT_|ID_WWN)\"/' $TMPFILE
+diff --git a/multipath/mpathconf.8 b/multipath/mpathconf.8
+index 496383b7..9c2fb835 100644
+--- a/multipath/mpathconf.8
++++ b/multipath/mpathconf.8
+@@ -77,6 +77,15 @@ to the
+ defaults section. If set to \fBn\fP, this removes the line, if present. This
+ command can be used along with any other command.
+ .TP
++.B --recheck_wwid \fP { \fBy\fP | \fBn\fP }
++If set to \fBy\fP, this adds the line
++.B recheck_wwid yes
++to the
++.B /etc/multipath.conf
++defaults section, or sets an existing line to \fByes\fP. If set to \fBn\fP, this
++sets an existing \fBrecheck_wwid\fP line to \fBno\fP. This command can be used
++along with any other command.
++.TP
+ .B --find_multipaths\fP { \fByes\fP | \fBno\fP | \fBstrict\fP | \fBgreedy\fP | \fBsmart\fP }
+ If set to \fB<value>\fP, this adds the line
+ .B find_multipaths <value>

SOURCES/0040-libmultipath-limit-reading-0xc9-vpd-page.patch

@@ -1,98 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Wed, 7 Oct 2020 21:43:02 -0500
-Subject: [PATCH] libmultipath: limit reading 0xc9 vpd page
-
-Only rdac arrays support 0xC9 vpd page inquiries. All other arrays will
-return a failure. Only do the rdac inquiry when detecting array
-capabilities if the array's path checker is explicitly set to rdac, or
-the path checker is not set, and the array reports that it supports vpd
-page 0xC9 in the Supported VPD Pages (0x00) vpd page.
-
-Multipath was doing the check if either the path checker was set to
-rdac, or no path checker was set.  This means that for almost all
-non-rdac arrays, multipath was issuing a bad inquiry. This was annoying
-users.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/discovery.c | 25 +++++++++++++++++++++++++
- libmultipath/discovery.h |  1 +
- libmultipath/propsel.c   | 10 ++++++----
- 3 files changed, 32 insertions(+), 4 deletions(-)
-
-diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
-index eb1e735d..01aadba9 100644
---- a/libmultipath/discovery.c
-+++ b/libmultipath/discovery.c
-@@ -1266,6 +1266,31 @@ fetch_vpd_page(int fd, int pg, unsigned char *buff)
- 	return buff_len;
- }
- 
-+/* heavily based on sg_inq.c from sg3_utils */
-+bool
-+is_vpd_page_supported(int fd, int pg)
-+{
-+	int i, len, buff_len;
-+	unsigned char buff[4096];
-+
-+	buff_len = fetch_vpd_page(fd, 0x00, buff);
-+	if (buff_len < 0)
-+		return false;
-+	if (buff_len < 4) {
-+		condlog(3, "VPD page 00h too short");
-+		return false;
-+	}
-+
-+	len = buff[3] + 4;
-+	if (len > buff_len)
-+		condlog(3, "vpd page 00h trucated, expected %d, have %d",
-+			len, buff_len);
-+	for (i = 4; i < len; ++i)
-+		if (buff[i] == pg)
-+			return true;
-+	return false;
-+}
-+
- int
- get_vpd_sgio (int fd, int pg, int vend_id, char * str, int maxlen)
- {
-diff --git a/libmultipath/discovery.h b/libmultipath/discovery.h
-index 6444887d..d3193daf 100644
---- a/libmultipath/discovery.h
-+++ b/libmultipath/discovery.h
-@@ -56,6 +56,7 @@ int sysfs_get_asymmetric_access_state(struct path *pp,
- 				      char *buff, int buflen);
- int get_uid(struct path * pp, int path_state, struct udev_device *udev,
- 	    int allow_fallback);
-+bool is_vpd_page_supported(int fd, int pg);
- 
- /*
-  * discovery bitmask
-diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
-index d362beb4..d7febec6 100644
---- a/libmultipath/propsel.c
-+++ b/libmultipath/propsel.c
-@@ -496,13 +496,15 @@ check_rdac(struct path * pp)
- {
- 	int len;
- 	char buff[44];
--	const char *checker_name;
-+	const char *checker_name = NULL;
- 
- 	if (pp->bus != SYSFS_BUS_SCSI)
- 		return 0;
--	/* Avoid ioctl if this is likely not an RDAC array */
--	if (__do_set_from_hwe(checker_name, pp, checker_name) &&
--	    strcmp(checker_name, RDAC))
-+	/* Avoid checking 0xc9 if this is likely not an RDAC array */
-+	if (!__do_set_from_hwe(checker_name, pp, checker_name) &&
-+	    !is_vpd_page_supported(pp->fd, 0xC9))
-+		return 0;
-+	if (checker_name && strcmp(checker_name, RDAC))
- 		return 0;
- 	len = get_vpd_sgio(pp->fd, 0xC9, 0, buff, 44);
- 	if (len <= 0)
--- 
-2.17.2
-

SOURCES/0041-libmultipath-add-device-to-hwtable.c.patch

@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Steve Schremmer <steve.schremmer@netapp.com>
-Date: Mon, 6 Jul 2020 20:22:35 +0000
-Subject: [PATCH] libmultipath: add device to hwtable.c
-
-Add FUJITSU ETERNUS_AHB defaults.
-
-Signed-off-by: Steve Schremmer <steve.schremmer@netapp.com>
-Reviewed-by: Martin Wilck <mwilck@suse.com>
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/hwtable.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
-index d1fcfdb3..d680bdfc 100644
---- a/libmultipath/hwtable.c
-+++ b/libmultipath/hwtable.c
-@@ -428,6 +428,22 @@ static struct hwentry default_hw[] = {
- 		.pgpolicy      = MULTIBUS,
- 		.no_path_retry = 10,
- 	},
-+	{
-+		/*
-+		 * ETERNUS AB/HB
-+		 * Maintainer: NetApp RDAC team <ng-eseries-upstream-maintainers@netapp.com>
-+		 */
-+		.vendor        = "FUJITSU",
-+		.product       = "ETERNUS_AHB",
-+		.bl_product    = "Universal Xport",
-+		.pgpolicy      = GROUP_BY_PRIO,
-+		.checker_name  = RDAC,
-+		.features      = "2 pg_init_retries 50",
-+		.hwhandler     = "1 rdac",
-+		.prio_name     = PRIO_RDAC,
-+		.pgfailback    = -FAILBACK_IMMEDIATE,
-+		.no_path_retry = 30,
-+	},
- 	/*
- 	 * Hitachi Vantara
- 	 *
--- 
-2.17.2
-

SOURCES/0041-multipathd-handle-fpin-events.patch

@@ -32,22 +32,23 @@ Reviewed-by: Martin Wilck <mwilck@suse.com>
  Makefile.inc                      |  13 +
  libmultipath/Makefile             |   5 +
  libmultipath/dict.c               |  56 +++-
- libmultipath/propsel.c     |  47 +++-
+ libmultipath/libmultipath.version |   5 +
+ libmultipath/propsel.c            |  47 ++-
  libmultipath/structs.h            |   7 +
  multipath/multipath.conf.5        |  19 +-
  multipathd/Makefile               |  10 +
  multipathd/fpin.h                 |  20 ++
- multipathd/fpin_handlers.c | 541 +++++++++++++++++++++++++++++++++++++
+ multipathd/fpin_handlers.c        | 540 ++++++++++++++++++++++++++++++
- multipathd/main.c          |  35 ++-
+ multipathd/main.c                 |  43 ++-
- 10 files changed, 738 insertions(+), 15 deletions(-)
+ 11 files changed, 749 insertions(+), 16 deletions(-)
  create mode 100644 multipathd/fpin.h
  create mode 100644 multipathd/fpin_handlers.c
 
 diff --git a/Makefile.inc b/Makefile.inc
-index 220009e0..25c16f4e 100644
+index 5ac660de..688c4599 100644
 --- a/Makefile.inc
 +++ b/Makefile.inc
-@@ -146,6 +146,19 @@ check_file = $(shell \
+@@ -149,6 +149,19 @@ check_file = $(shell \
  	echo "$$found" \
  	)
  
@@ -68,10 +69,10 @@ index 220009e0..25c16f4e 100644
  	@echo building $@ because of $?
  	$(CC) $(CFLAGS) -c -o $@ $<
 diff --git a/libmultipath/Makefile b/libmultipath/Makefile
-index ad690a49..49f71dfa 100644
+index 7f3921c5..8a960419 100644
 --- a/libmultipath/Makefile
 +++ b/libmultipath/Makefile
-@@ -40,6 +40,11 @@ ifneq ($(call check_func,dm_hold_control_dev,/usr/include/libdevmapper.h),0)
+@@ -45,6 +45,11 @@ ifneq ($(call check_func,dm_hold_control_dev,/usr/include/libdevmapper.h),0)
  	CFLAGS += -DLIBDM_API_HOLD_CONTROL
  endif
  
@@ -84,10 +85,10 @@ index ad690a49..49f71dfa 100644
  	hwtable.o blacklist.o util.o dmparser.o config.o \
  	structs.o discovery.o propsel.o dict.o \
 diff --git a/libmultipath/dict.c b/libmultipath/dict.c
-index 8321ec1e..d7cd94a5 100644
+index 1b75be47..eb5a8083 100644
 --- a/libmultipath/dict.c
 +++ b/libmultipath/dict.c
-@@ -579,6 +579,59 @@ snprint_def_find_multipaths(struct config *conf, char *buff, int len,
+@@ -513,6 +513,59 @@ snprint_def_find_multipaths(struct config *conf, struct strbuf *buff,
  			 find_multipaths_optvals[conf->find_multipaths]);
  }
  
@@ -136,10 +137,10 @@ index 8321ec1e..d7cd94a5 100644
 +}
 +
 +static int
-+snprint_def_marginal_pathgroups(struct config *conf, char *buff, int len,
++snprint_def_marginal_pathgroups(struct config *conf, struct strbuf *buff,
 +			    const void *data)
 +{
-+	return snprintf(buff, len, "\"%s\"",
++	return append_strbuf_quoted(buff,
 +			 marginal_pathgroups_optvals[conf->marginal_pathgroups]);
 +}
 +
@@ -147,7 +148,7 @@ index 8321ec1e..d7cd94a5 100644
  declare_def_handler(selector, set_str)
  declare_def_snprint_defstr(selector, print_str, DEFAULT_SELECTOR)
  declare_hw_handler(selector, set_str)
-@@ -1596,9 +1649,6 @@ declare_ovr_snprint(all_tg_pt, print_yes_no_undef)
+@@ -1527,9 +1580,6 @@ declare_ovr_snprint(all_tg_pt, print_yes_no_undef)
  declare_hw_handler(all_tg_pt, set_yes_no_undef)
  declare_hw_snprint(all_tg_pt, print_yes_no_undef)
  
@@ -157,11 +158,24 @@ index 8321ec1e..d7cd94a5 100644
  declare_def_handler(recheck_wwid, set_yes_no_undef)
  declare_def_snprint_defint(recheck_wwid, print_yes_no_undef, DEFAULT_RECHECK_WWID)
  declare_ovr_handler(recheck_wwid, set_yes_no_undef)
+diff --git a/libmultipath/libmultipath.version b/libmultipath/libmultipath.version
+index 0d89e9e1..1d018eab 100644
+--- a/libmultipath/libmultipath.version
++++ b/libmultipath/libmultipath.version
+@@ -297,3 +297,8 @@ LIBMULTIPATH_9.1.1 {
+ global:
+ 	trigger_path_udev_change;
+ } LIBMULTIPATH_9.1.0;
++
++LIBMULTIPATH_9.1.2 {
++global:
++	cleanup_mutex;
++} LIBMULTIPATH_9.1.1;
 diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
-index 209c1d67..be79902f 100644
+index b2876670..677ab9e1 100644
 --- a/libmultipath/propsel.c
 +++ b/libmultipath/propsel.c
-@@ -85,6 +85,8 @@ static const char cmdline_origin[] =
+@@ -84,6 +84,8 @@ static const char cmdline_origin[] =
  	"(setting: multipath command line [-p] flag)";
  static const char autodetect_origin[] =
  	"(setting: storage device autodetected)";
@@ -170,9 +184,9 @@ index 209c1d67..be79902f 100644
  static const char marginal_path_origin[] =
  	"(setting: implied by marginal_path check)";
  static const char delay_watch_origin[] =
-@@ -1052,9 +1054,12 @@ int select_san_path_err_threshold(struct config *conf, struct multipath *mp)
+@@ -1036,9 +1038,12 @@ int select_san_path_err_threshold(struct config *conf, struct multipath *mp)
  	const char *origin;
- 	char buff[12];
+ 	STRBUF_ON_STACK(buff);
  
 -	if (marginal_path_check_enabled(mp)) {
 +	if (marginal_path_check_enabled(mp) || (conf->marginal_pathgroups == MARGINAL_PATHGROUP_FPIN)) {
@@ -185,9 +199,9 @@ index 209c1d67..be79902f 100644
  		goto out;
  	}
  	mp_set_mpe(san_path_err_threshold);
-@@ -1075,9 +1080,12 @@ int select_san_path_err_forget_rate(struct config *conf, struct multipath *mp)
+@@ -1059,9 +1064,12 @@ int select_san_path_err_forget_rate(struct config *conf, struct multipath *mp)
  	const char *origin;
- 	char buff[12];
+ 	STRBUF_ON_STACK(buff);
  
 -	if (marginal_path_check_enabled(mp)) {
 +	if (marginal_path_check_enabled(mp) || (conf->marginal_pathgroups == MARGINAL_PATHGROUP_FPIN)) {
@@ -200,9 +214,9 @@ index 209c1d67..be79902f 100644
  		goto out;
  	}
  	mp_set_mpe(san_path_err_forget_rate);
-@@ -1099,9 +1107,12 @@ int select_san_path_err_recovery_time(struct config *conf, struct multipath *mp)
+@@ -1083,9 +1091,12 @@ int select_san_path_err_recovery_time(struct config *conf, struct multipath *mp)
  	const char *origin;
- 	char buff[12];
+ 	STRBUF_ON_STACK(buff);
  
 -	if (marginal_path_check_enabled(mp)) {
 +	if (marginal_path_check_enabled(mp) || (conf->marginal_pathgroups == MARGINAL_PATHGROUP_FPIN)) {
@@ -215,9 +229,9 @@ index 209c1d67..be79902f 100644
  		goto out;
  	}
  	mp_set_mpe(san_path_err_recovery_time);
-@@ -1123,6 +1134,12 @@ int select_marginal_path_err_sample_time(struct config *conf, struct multipath *
+@@ -1107,6 +1118,12 @@ int select_marginal_path_err_sample_time(struct config *conf, struct multipath *
  	const char *origin;
- 	char buff[12];
+ 	STRBUF_ON_STACK(buff);
  
 +	if (conf->marginal_pathgroups == MARGINAL_PATHGROUP_FPIN) {
 +		mp->marginal_path_err_sample_time = NU_NO;
@@ -228,9 +242,9 @@ index 209c1d67..be79902f 100644
  	mp_set_mpe(marginal_path_err_sample_time);
  	mp_set_ovr(marginal_path_err_sample_time);
  	mp_set_hwe(marginal_path_err_sample_time);
-@@ -1141,6 +1158,12 @@ int select_marginal_path_err_rate_threshold(struct config *conf, struct multipat
+@@ -1130,6 +1147,12 @@ int select_marginal_path_err_rate_threshold(struct config *conf, struct multipat
  	const char *origin;
- 	char buff[12];
+ 	STRBUF_ON_STACK(buff);
  
 +	if (conf->marginal_pathgroups == MARGINAL_PATHGROUP_FPIN) {
 +		mp->marginal_path_err_rate_threshold = NU_NO;
@@ -241,9 +255,9 @@ index 209c1d67..be79902f 100644
  	mp_set_mpe(marginal_path_err_rate_threshold);
  	mp_set_ovr(marginal_path_err_rate_threshold);
  	mp_set_hwe(marginal_path_err_rate_threshold);
-@@ -1159,6 +1182,12 @@ int select_marginal_path_err_recheck_gap_time(struct config *conf, struct multip
+@@ -1147,6 +1170,12 @@ int select_marginal_path_err_recheck_gap_time(struct config *conf, struct multip
  	const char *origin;
- 	char buff[12];
+ 	STRBUF_ON_STACK(buff);
  
 +	if (conf->marginal_pathgroups == MARGINAL_PATHGROUP_FPIN) {
 +		mp->marginal_path_err_recheck_gap_time = NU_NO;
@@ -254,9 +268,9 @@ index 209c1d67..be79902f 100644
  	mp_set_mpe(marginal_path_err_recheck_gap_time);
  	mp_set_ovr(marginal_path_err_recheck_gap_time);
  	mp_set_hwe(marginal_path_err_recheck_gap_time);
-@@ -1177,6 +1206,12 @@ int select_marginal_path_double_failed_time(struct config *conf, struct multipat
+@@ -1165,6 +1194,12 @@ int select_marginal_path_double_failed_time(struct config *conf, struct multipat
  	const char *origin;
- 	char buff[12];
+ 	STRBUF_ON_STACK(buff);
  
 +	if (conf->marginal_pathgroups == MARGINAL_PATHGROUP_FPIN) {
 +		mp->marginal_path_double_failed_time = NU_NO;
@@ -268,10 +282,10 @@ index 209c1d67..be79902f 100644
  	mp_set_ovr(marginal_path_double_failed_time);
  	mp_set_hwe(marginal_path_double_failed_time);
 diff --git a/libmultipath/structs.h b/libmultipath/structs.h
-index 875e726e..3ed5cfc1 100644
+index 399540e7..1188363e 100644
 --- a/libmultipath/structs.h
 +++ b/libmultipath/structs.h
-@@ -128,6 +128,12 @@ enum find_multipaths_states {
+@@ -110,6 +110,12 @@ enum find_multipaths_states {
  	__FIND_MULTIPATHS_LAST,
  };
  
@@ -284,7 +298,7 @@ index 875e726e..3ed5cfc1 100644
  enum flush_states {
  	FLUSH_UNDEF = YNU_UNDEF,
  	FLUSH_DISABLED = YNU_NO,
-@@ -429,6 +435,7 @@ struct multipath {
+@@ -409,6 +415,7 @@ struct multipath {
  	unsigned char prflag;
  	int all_tg_pt;
  	struct gen_multipath generic_mp;
@@ -293,10 +307,10 @@ index 875e726e..3ed5cfc1 100644
  
  static inline int marginal_path_check_enabled(const struct multipath *mpp)
 diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
-index abbc89af..805b7a5e 100644
+index 7f85f766..5ed2cd3c 100644
 --- a/multipath/multipath.conf.5
 +++ b/multipath/multipath.conf.5
-@@ -1063,20 +1063,26 @@ The default is: \fBno\fR
+@@ -1088,20 +1088,26 @@ The default is: \fBno\fR
  .
  .TP
  .B marginal_pathgroups
@@ -326,7 +340,7 @@ index abbc89af..805b7a5e 100644
  .RS
  .TP
  The default is: \fBno\fR
-@@ -1852,6 +1858,13 @@ increase and the threshold is never reached. Ticks are the time between
+@@ -1842,6 +1848,13 @@ increase and the threshold is never reached. Ticks are the time between
  path checks by multipathd, which is variable and controlled by the
  \fIpolling_interval\fR and \fImax_polling_interval\fR parameters.
  .
@@ -341,11 +355,12 @@ index abbc89af..805b7a5e 100644
  .LP
  This method is \fBdeprecated\fR in favor of the \(dqmarginal_path\(dq failure
 diff --git a/multipathd/Makefile b/multipathd/Makefile
-index 8d901178..835edd93 100644
+index 393b6cbb..cd6f7e6d 100644
 --- a/multipathd/Makefile
 +++ b/multipathd/Makefile
-@@ -1,5 +1,9 @@
+@@ -4,6 +4,10 @@ ifneq ($(call check_func,dm_task_get_errno,/usr/include/libdevmapper.h),0)
- include ../Makefile.inc
+ 	CFLAGS += -DLIBDM_API_GET_ERRNO
+ endif
  
 +ifneq ($(call check_var,ELS_DTAG_LNK_INTEGRITY,/usr/include/scsi/fc/fc_els.h),0)
 +	CFLAGS += -DFPIN_EVENT_HANDLER
@@ -354,9 +369,9 @@ index 8d901178..835edd93 100644
  #
  # debugging stuff
  #
-@@ -28,6 +32,12 @@ endif
+@@ -34,6 +38,12 @@ endif
  OBJS = main.o pidfile.o uxlsnr.o uxclnt.o cli.o cli_handlers.o waiter.o \
-        dmevents.o
+        dmevents.o init_unwinder.o
  
 +ifeq ($(FPIN_SUPPORT),1)
 +OBJS += fpin_handlers.o
@@ -395,16 +410,15 @@ index 00000000..bfcc1ce2
 +#endif
 diff --git a/multipathd/fpin_handlers.c b/multipathd/fpin_handlers.c
 new file mode 100644
-index 00000000..b14366d7
+index 00000000..aaf5655d
 --- /dev/null
 +++ b/multipathd/fpin_handlers.c
-@@ -0,0 +1,541 @@
+@@ -0,0 +1,540 @@
 +#include <errno.h>
 +#include <unistd.h>
 +#include <sys/types.h>
 +#include <sys/socket.h>
 +#include <libudev.h>
-+#include <stdint.h>
 +#include <scsi/scsi_netlink_fc.h>
 +#include <scsi/fc/fc_els.h>
 +
@@ -525,10 +539,10 @@ index 00000000..b14366d7
 +	}
 +empty:
 +	pthread_cleanup_pop(1);
-+	/* walk backwards because update_path_groups() can remove mpp */
++	/* walk backwards because reload_and_sync_map() can remove mpp */
 +	vector_foreach_slot_backwards(vecs->mpvec, mpp, i) {
 +		if (mpp->fpin_must_reload) {
-+			ret = update_path_groups(mpp, vecs, 0);
++			ret = reload_and_sync_map(mpp, vecs, 0);
 +			if (ret == 2)
 +				condlog(2, "map removed during reload");
 +			else
@@ -653,10 +667,10 @@ index 00000000..b14366d7
 +unref:
 +		pthread_cleanup_pop(1);
 +	}
-+	/* walk backwards because update_path_groups() can remove mpp */
++	/* walk backwards because reload_and_sync_map() can remove mpp */
 +	vector_foreach_slot_backwards(vecs->mpvec, mpp, i) {
 +		if (mpp->fpin_must_reload) {
-+			ret = update_path_groups(mpp, vecs, 0);
++			ret = reload_and_sync_map(mpp, vecs, 0);
 +			if (ret == 2)
 +				condlog(2, "map removed during reload");
 +			else
@@ -941,7 +955,7 @@ index 00000000..b14366d7
 +	return NULL;
 +}
 diff --git a/multipathd/main.c b/multipathd/main.c
-index eeded52b..4cf5bc41 100644
+index 5def5301..53be9b95 100644
 --- a/multipathd/main.c
 +++ b/multipathd/main.c
 @@ -16,6 +16,7 @@
@@ -952,7 +966,21 @@ index eeded52b..4cf5bc41 100644
  #ifdef USE_SYSTEMD
  #include <systemd/sd-daemon.h>
  #endif
-@@ -2704,7 +2705,9 @@ reconfigure (struct vectors * vecs)
+@@ -130,9 +131,11 @@ static volatile enum daemon_status running_state = DAEMON_INIT;
+ pid_t daemon_pid;
+ static pthread_mutex_t config_lock = PTHREAD_MUTEX_INITIALIZER;
+ static pthread_cond_t config_cond;
+-static pthread_t check_thr, uevent_thr, uxlsnr_thr, uevq_thr, dmevent_thr;
++static pthread_t check_thr, uevent_thr, uxlsnr_thr, uevq_thr, dmevent_thr,
++	fpin_thr, fpin_consumer_thr;
+ static bool check_thr_started, uevent_thr_started, uxlsnr_thr_started,
+-	uevq_thr_started, dmevent_thr_started;
++	uevq_thr_started, dmevent_thr_started, fpin_thr_started,
++	fpin_consumer_thr_started;
+ static int pid_fd = -1;
+ 
+ static inline enum daemon_status get_running_state(void)
+@@ -2819,7 +2822,9 @@ reconfigure (struct vectors * vecs)
  	conf->sequence_nr = old->sequence_nr + 1;
  	rcu_assign_pointer(multipath_conf, conf);
  	call_rcu(&old->rcu, rcu_free_config);
@@ -963,25 +991,39 @@ index eeded52b..4cf5bc41 100644
  	configure(vecs);
  
  
-@@ -2878,7 +2881,8 @@ set_oom_adj (void)
+@@ -3060,6 +3065,11 @@ static void cleanup_threads(void)
- static int
+ 		pthread_cancel(uevq_thr);
- child (__attribute__((unused)) void *param)
+ 	if (dmevent_thr_started)
- {
+ 		pthread_cancel(dmevent_thr);
--	pthread_t check_thr, uevent_thr, uxlsnr_thr, uevq_thr, dmevent_thr;
++	if (fpin_thr_started)
-+	pthread_t check_thr, uevent_thr, uxlsnr_thr, uevq_thr, dmevent_thr,
++		pthread_cancel(fpin_thr);
-+		  fpin_thr, fpin_consumer_thr;
++	if (fpin_consumer_thr_started)
- 	pthread_attr_t log_attr, misc_attr, uevent_attr;
++		pthread_cancel(fpin_consumer_thr);
- 	struct vectors * vecs;
++
- 	struct multipath * mpp;
+ 
-@@ -2892,6 +2896,7 @@ child (__attribute__((unused)) void *param)
+ 	if (check_thr_started)
+ 		pthread_join(check_thr, NULL);
+@@ -3071,6 +3081,11 @@ static void cleanup_threads(void)
+ 		pthread_join(uevq_thr, NULL);
+ 	if (dmevent_thr_started)
+ 		pthread_join(dmevent_thr, NULL);
++	if (fpin_thr_started)
++		pthread_join(fpin_thr, NULL);
++	if (fpin_consumer_thr_started)
++		pthread_join(fpin_consumer_thr, NULL);
++
+ 
+ 	/*
+ 	 * As all threads are joined now, and we're in DAEMON_SHUTDOWN
+@@ -3168,6 +3183,7 @@ child (__attribute__((unused)) void *param)
  	char *envp;
- 	int queue_without_daemon;
  	enum daemon_status state;
+ 	int exit_code = 1;
 +	int fpin_marginal_paths = 0;
  
+ 	init_unwinder();
  	mlockall(MCL_CURRENT | MCL_FUTURE);
- 	signal_init();
+@@ -3246,7 +3262,10 @@ child (__attribute__((unused)) void *param)
-@@ -2959,7 +2964,10 @@ child (__attribute__((unused)) void *param)
  
  	setscheduler();
  	set_oom_adj();
@@ -993,45 +1035,26 @@ index eeded52b..4cf5bc41 100644
  	/*
  	 * Startup done, invalidate configuration
  	 */
-@@ -3020,6 +3028,19 @@ child (__attribute__((unused)) void *param)
+@@ -3314,6 +3333,22 @@ child (__attribute__((unused)) void *param)
- 		condlog(0, "failed to create uevent dispatcher: %d", rc);
  		goto failed;
- 	}
+ 	} else
+ 		uevq_thr_started = true;
++
 +	if (fpin_marginal_paths) {
 +		if ((rc = pthread_create(&fpin_thr, &misc_attr,
 +			fpin_fabric_notification_receiver, NULL))) {
 +			condlog(0, "failed to create the fpin receiver thread: %d", rc);
 +			goto failed;
-+		}
++		} else
++			fpin_thr_started = true;
 +
 +		if ((rc = pthread_create(&fpin_consumer_thr,
 +			&misc_attr, fpin_els_li_consumer, vecs))) {
 +			condlog(0, "failed to create the fpin consumer thread thread: %d", rc);
 +			goto failed;
-+		}
++		} else
++			fpin_consumer_thr_started = true;
 +	}
  	pthread_attr_destroy(&misc_attr);
  
  	while (1) {
-@@ -3070,6 +3091,10 @@ child (__attribute__((unused)) void *param)
- 	pthread_cancel(uevq_thr);
- 	if (poll_dmevents)
- 		pthread_cancel(dmevent_thr);
-+	if (fpin_marginal_paths) {
-+		pthread_cancel(fpin_thr);
-+		pthread_cancel(fpin_consumer_thr);
-+	}
- 
- 	pthread_join(check_thr, NULL);
- 	pthread_join(uevent_thr, NULL);
-@@ -3077,6 +3102,10 @@ child (__attribute__((unused)) void *param)
- 	pthread_join(uevq_thr, NULL);
- 	if (poll_dmevents)
- 		pthread_join(dmevent_thr, NULL);
-+	if (fpin_marginal_paths) {
-+		pthread_join(fpin_thr, NULL);
-+		pthread_join(fpin_consumer_thr, NULL);
-+	}
- 
- 	stop_io_err_stat_thread();
- 

SOURCES/0042-libmultipath-move-fast_io_fail-defines-to-structs.h.patch

@@ -1,159 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Mon, 12 Oct 2020 16:06:11 -0500
-Subject: [PATCH] libmultipath: move fast_io_fail defines to structs.h
-
-Since fast_io_fail is part of the multipath struct, its symbolic values
-belong in structs.h. Also, make it an instance of a general enum, which
-will be used again in future patches, and change the set/print functions
-which use it to use the general enum instead.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/config.h  |  8 --------
- libmultipath/dict.c    | 30 +++++++++++++++---------------
- libmultipath/dict.h    |  2 +-
- libmultipath/propsel.c |  2 +-
- libmultipath/structs.h | 17 +++++++++++++++++
- 5 files changed, 34 insertions(+), 25 deletions(-)
-
-diff --git a/libmultipath/config.h b/libmultipath/config.h
-index 160867cd..f38c7639 100644
---- a/libmultipath/config.h
-+++ b/libmultipath/config.h
-@@ -11,14 +11,6 @@
- #define ORIGIN_CONFIG  1
- #define ORIGIN_NO_CONFIG 2
- 
--/*
-- * In kernel, fast_io_fail == 0 means immediate failure on rport delete.
-- * OTOH '0' means not-configured in various places in multipath-tools.
-- */
--#define MP_FAST_IO_FAIL_UNSET (0)
--#define MP_FAST_IO_FAIL_OFF (-1)
--#define MP_FAST_IO_FAIL_ZERO (-2)
--
- enum devtypes {
- 	DEV_NONE,
- 	DEV_DEVT,
-diff --git a/libmultipath/dict.c b/libmultipath/dict.c
-index 184d4b22..ce8e1cda 100644
---- a/libmultipath/dict.c
-+++ b/libmultipath/dict.c
-@@ -834,7 +834,7 @@ declare_mp_attr_handler(gid, set_gid)
- declare_mp_attr_snprint(gid, print_gid)
- 
- static int
--set_fast_io_fail(vector strvec, void *ptr)
-+set_undef_off_zero(vector strvec, void *ptr)
- {
- 	char * buff;
- 	int *int_ptr = (int *)ptr;
-@@ -844,36 +844,36 @@ set_fast_io_fail(vector strvec, void *ptr)
- 		return 1;
- 
- 	if (strcmp(buff, "off") == 0)
--		*int_ptr = MP_FAST_IO_FAIL_OFF;
-+		*int_ptr = UOZ_OFF;
- 	else if (sscanf(buff, "%d", int_ptr) != 1 ||
--		 *int_ptr < MP_FAST_IO_FAIL_ZERO)
--		*int_ptr = MP_FAST_IO_FAIL_UNSET;
-+		 *int_ptr < UOZ_ZERO)
-+		*int_ptr = UOZ_UNDEF;
- 	else if (*int_ptr == 0)
--		*int_ptr = MP_FAST_IO_FAIL_ZERO;
-+		*int_ptr = UOZ_ZERO;
- 
- 	FREE(buff);
- 	return 0;
- }
- 
- int
--print_fast_io_fail(char * buff, int len, long v)
-+print_undef_off_zero(char * buff, int len, long v)
- {
--	if (v == MP_FAST_IO_FAIL_UNSET)
-+	if (v == UOZ_UNDEF)
- 		return 0;
--	if (v == MP_FAST_IO_FAIL_OFF)
-+	if (v == UOZ_OFF)
- 		return snprintf(buff, len, "\"off\"");
--	if (v == MP_FAST_IO_FAIL_ZERO)
-+	if (v == UOZ_ZERO)
- 		return snprintf(buff, len, "0");
- 	return snprintf(buff, len, "%ld", v);
- }
- 
--declare_def_handler(fast_io_fail, set_fast_io_fail)
--declare_def_snprint_defint(fast_io_fail, print_fast_io_fail,
-+declare_def_handler(fast_io_fail, set_undef_off_zero)
-+declare_def_snprint_defint(fast_io_fail, print_undef_off_zero,
- 			   DEFAULT_FAST_IO_FAIL)
--declare_ovr_handler(fast_io_fail, set_fast_io_fail)
--declare_ovr_snprint(fast_io_fail, print_fast_io_fail)
--declare_hw_handler(fast_io_fail, set_fast_io_fail)
--declare_hw_snprint(fast_io_fail, print_fast_io_fail)
-+declare_ovr_handler(fast_io_fail, set_undef_off_zero)
-+declare_ovr_snprint(fast_io_fail, print_undef_off_zero)
-+declare_hw_handler(fast_io_fail, set_undef_off_zero)
-+declare_hw_snprint(fast_io_fail, print_undef_off_zero)
- 
- static int
- set_dev_loss(vector strvec, void *ptr)
-diff --git a/libmultipath/dict.h b/libmultipath/dict.h
-index a40ac66f..a917e1ca 100644
---- a/libmultipath/dict.h
-+++ b/libmultipath/dict.h
-@@ -13,7 +13,7 @@ int print_rr_weight(char *buff, int len, long v);
- int print_pgfailback(char *buff, int len, long v);
- int print_pgpolicy(char *buff, int len, long v);
- int print_no_path_retry(char *buff, int len, long v);
--int print_fast_io_fail(char *buff, int len, long v);
-+int print_undef_off_zero(char *buff, int len, long v);
- int print_dev_loss(char *buff, int len, unsigned long v);
- int print_reservation_key(char * buff, int len, struct be64 key, uint8_t
- 			  flags, int source);
-diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
-index d7febec6..725db2b1 100644
---- a/libmultipath/propsel.c
-+++ b/libmultipath/propsel.c
-@@ -755,7 +755,7 @@ int select_fast_io_fail(struct config *conf, struct multipath *mp)
- 	mp_set_conf(fast_io_fail);
- 	mp_set_default(fast_io_fail, DEFAULT_FAST_IO_FAIL);
- out:
--	print_fast_io_fail(buff, 12, mp->fast_io_fail);
-+	print_undef_off_zero(buff, 12, mp->fast_io_fail);
- 	condlog(3, "%s: fast_io_fail_tmo = %s %s", mp->alias, buff, origin);
- 	return 0;
- }
-diff --git a/libmultipath/structs.h b/libmultipath/structs.h
-index 8e78b8c0..29209984 100644
---- a/libmultipath/structs.h
-+++ b/libmultipath/structs.h
-@@ -229,6 +229,23 @@ enum vpd_vendor_ids {
- 	VPD_VP_ARRAY_SIZE, /* This must remain the last entry */
- };
- 
-+/*
-+ * Multipath treats 0 as undefined for optional config parameters.
-+ * Use this for cases where 0 is a valid option for systems multipath
-+ * is communicating with
-+ */
-+enum undefined_off_zero {
-+	UOZ_UNDEF = 0,
-+	UOZ_OFF = -1,
-+	UOZ_ZERO = -2,
-+};
-+
-+enum fast_io_fail_states {
-+	MP_FAST_IO_FAIL_UNSET = UOZ_UNDEF,
-+	MP_FAST_IO_FAIL_OFF = UOZ_OFF,
-+	MP_FAST_IO_FAIL_ZERO = UOZ_ZERO,
-+};
-+
- struct vpd_vendor_page {
- 	int pg;
- 	const char *name;
--- 
-2.17.2
-

SOURCES/0042-multipathd-disallow-changing-to-from-fpin-marginal-p.patch

@@ -17,10 +17,10 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  2 files changed, 17 insertions(+), 5 deletions(-)
 
 diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
-index 805b7a5e..8e418372 100644
+index 5ed2cd3c..58ad5c9c 100644
 --- a/multipath/multipath.conf.5
 +++ b/multipath/multipath.conf.5
-@@ -1077,15 +1077,18 @@ have been tried first. This prevents the possibility of IO errors occuring
+@@ -1102,15 +1102,18 @@ have been tried first. This prevents the possibility of IO errors occuring
  while marginal paths are still usable. After the path has been monitored
  for the configured time, and is declared healthy, it will be returned to its
  normal pathgroup.
@@ -45,10 +45,10 @@ index 805b7a5e..8e418372 100644
  .
  .
 diff --git a/multipathd/main.c b/multipathd/main.c
-index 4cf5bc41..a6ffbe32 100644
+index 53be9b95..45b9572f 100644
 --- a/multipathd/main.c
 +++ b/multipathd/main.c
-@@ -2675,6 +2675,7 @@ int
+@@ -2792,6 +2792,7 @@ int
  reconfigure (struct vectors * vecs)
  {
  	struct config * old, *conf;
@@ -56,7 +56,7 @@ index 4cf5bc41..a6ffbe32 100644
  
  	conf = load_config(DEFAULT_CONFIGFILE);
  	if (!conf)
-@@ -2702,6 +2703,14 @@ reconfigure (struct vectors * vecs)
+@@ -2819,6 +2820,14 @@ reconfigure (struct vectors * vecs)
  	uxsock_timeout = conf->uxsock_timeout;
  
  	old = rcu_dereference(multipath_conf);

SOURCES/0043-libmultipath-add-eh_deadline-multipath.conf-paramete.patch

@@ -1,295 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Wed, 14 Oct 2020 18:38:20 -0500
-Subject: [PATCH] libmultipath: add eh_deadline multipath.conf parameter
-
-There are times a fc rport is never lost, meaning that fast_io_fail_tmo
-and dev_loss_tmo never trigger, but scsi commands still hang. This can
-cause problems in cases where users have string timing requirements, and
-the easiest way to solve these issues is to set eh_deadline. Since it's
-already possible to set fast_io_fail_tmo and dev_loss_tmo from
-multipath.conf, and have multipath take care of setting it correctly for
-the scsi devices in sysfs, it makes sense to allow users to set
-eh_deadline here as well.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/config.c      |  2 ++
- libmultipath/config.h      |  2 ++
- libmultipath/configure.c   |  1 +
- libmultipath/dict.c        | 10 +++++++
- libmultipath/discovery.c   | 58 +++++++++++++++++++++++++++++++++-----
- libmultipath/propsel.c     | 17 +++++++++++
- libmultipath/propsel.h     |  1 +
- libmultipath/structs.h     |  7 +++++
- multipath/multipath.conf.5 | 16 +++++++++++
- 9 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git a/libmultipath/config.c b/libmultipath/config.c
-index 26f8e050..a71db2d0 100644
---- a/libmultipath/config.c
-+++ b/libmultipath/config.c
-@@ -359,6 +359,7 @@ merge_hwe (struct hwentry * dst, struct hwentry * src)
- 	merge_num(flush_on_last_del);
- 	merge_num(fast_io_fail);
- 	merge_num(dev_loss);
-+	merge_num(eh_deadline);
- 	merge_num(user_friendly_names);
- 	merge_num(retain_hwhandler);
- 	merge_num(detect_prio);
-@@ -514,6 +515,7 @@ store_hwe (vector hwtable, struct hwentry * dhwe)
- 	hwe->flush_on_last_del = dhwe->flush_on_last_del;
- 	hwe->fast_io_fail = dhwe->fast_io_fail;
- 	hwe->dev_loss = dhwe->dev_loss;
-+	hwe->eh_deadline = dhwe->eh_deadline;
- 	hwe->user_friendly_names = dhwe->user_friendly_names;
- 	hwe->retain_hwhandler = dhwe->retain_hwhandler;
- 	hwe->detect_prio = dhwe->detect_prio;
-diff --git a/libmultipath/config.h b/libmultipath/config.h
-index f38c7639..a22c1b4e 100644
---- a/libmultipath/config.h
-+++ b/libmultipath/config.h
-@@ -64,6 +64,7 @@ struct hwentry {
- 	int flush_on_last_del;
- 	int fast_io_fail;
- 	unsigned int dev_loss;
-+	int eh_deadline;
- 	int user_friendly_names;
- 	int retain_hwhandler;
- 	int detect_prio;
-@@ -149,6 +150,7 @@ struct config {
- 	int attribute_flags;
- 	int fast_io_fail;
- 	unsigned int dev_loss;
-+	int eh_deadline;
- 	int log_checker_err;
- 	int allow_queueing;
- 	int find_multipaths;
-diff --git a/libmultipath/configure.c b/libmultipath/configure.c
-index 96c79610..b7113291 100644
---- a/libmultipath/configure.c
-+++ b/libmultipath/configure.c
-@@ -340,6 +340,7 @@ int setup_map(struct multipath *mpp, char *params, int params_size,
- 	select_gid(conf, mpp);
- 	select_fast_io_fail(conf, mpp);
- 	select_dev_loss(conf, mpp);
-+	select_eh_deadline(conf, mpp);
- 	select_reservation_key(conf, mpp);
- 	select_deferred_remove(conf, mpp);
- 	select_marginal_path_err_sample_time(conf, mpp);
-diff --git a/libmultipath/dict.c b/libmultipath/dict.c
-index ce8e1cda..8fd91d8c 100644
---- a/libmultipath/dict.c
-+++ b/libmultipath/dict.c
-@@ -911,6 +911,13 @@ declare_ovr_snprint(dev_loss, print_dev_loss)
- declare_hw_handler(dev_loss, set_dev_loss)
- declare_hw_snprint(dev_loss, print_dev_loss)
- 
-+declare_def_handler(eh_deadline, set_undef_off_zero)
-+declare_def_snprint(eh_deadline, print_undef_off_zero)
-+declare_ovr_handler(eh_deadline, set_undef_off_zero)
-+declare_ovr_snprint(eh_deadline, print_undef_off_zero)
-+declare_hw_handler(eh_deadline, set_undef_off_zero)
-+declare_hw_snprint(eh_deadline, print_undef_off_zero)
-+
- static int
- set_pgpolicy(vector strvec, void *ptr)
- {
-@@ -1776,6 +1783,7 @@ init_keywords(vector keywords)
- 	install_keyword("gid", &def_gid_handler, &snprint_def_gid);
- 	install_keyword("fast_io_fail_tmo", &def_fast_io_fail_handler, &snprint_def_fast_io_fail);
- 	install_keyword("dev_loss_tmo", &def_dev_loss_handler, &snprint_def_dev_loss);
-+	install_keyword("eh_deadline", &def_eh_deadline_handler, &snprint_def_eh_deadline);
- 	install_keyword("bindings_file", &def_bindings_file_handler, &snprint_def_bindings_file);
- 	install_keyword("wwids_file", &def_wwids_file_handler, &snprint_def_wwids_file);
- 	install_keyword("prkeys_file", &def_prkeys_file_handler, &snprint_def_prkeys_file);
-@@ -1885,6 +1893,7 @@ init_keywords(vector keywords)
- 	install_keyword("flush_on_last_del", &hw_flush_on_last_del_handler, &snprint_hw_flush_on_last_del);
- 	install_keyword("fast_io_fail_tmo", &hw_fast_io_fail_handler, &snprint_hw_fast_io_fail);
- 	install_keyword("dev_loss_tmo", &hw_dev_loss_handler, &snprint_hw_dev_loss);
-+	install_keyword("eh_deadline", &hw_eh_deadline_handler, &snprint_hw_eh_deadline);
- 	install_keyword("user_friendly_names", &hw_user_friendly_names_handler, &snprint_hw_user_friendly_names);
- 	install_keyword("retain_attached_hw_handler", &hw_retain_hwhandler_handler, &snprint_hw_retain_hwhandler);
- 	install_keyword("detect_prio", &hw_detect_prio_handler, &snprint_hw_detect_prio);
-@@ -1925,6 +1934,7 @@ init_keywords(vector keywords)
- 	install_keyword("flush_on_last_del", &ovr_flush_on_last_del_handler, &snprint_ovr_flush_on_last_del);
- 	install_keyword("fast_io_fail_tmo", &ovr_fast_io_fail_handler, &snprint_ovr_fast_io_fail);
- 	install_keyword("dev_loss_tmo", &ovr_dev_loss_handler, &snprint_ovr_dev_loss);
-+	install_keyword("eh_deadline", &ovr_eh_deadline_handler, &snprint_ovr_eh_deadline);
- 	install_keyword("user_friendly_names", &ovr_user_friendly_names_handler, &snprint_ovr_user_friendly_names);
- 	install_keyword("retain_attached_hw_handler", &ovr_retain_hwhandler_handler, &snprint_ovr_retain_hwhandler);
- 	install_keyword("detect_prio", &ovr_detect_prio_handler, &snprint_ovr_detect_prio);
-diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
-index 01aadba9..a328aafa 100644
---- a/libmultipath/discovery.c
-+++ b/libmultipath/discovery.c
-@@ -577,6 +577,42 @@ sysfs_get_asymmetric_access_state(struct path *pp, char *buff, int buflen)
- 	return !!preferred;
- }
- 
-+static int
-+sysfs_set_eh_deadline(struct multipath *mpp, struct path *pp)
-+{
-+	struct udev_device *hostdev;
-+	char host_name[HOST_NAME_LEN], value[16];
-+	int ret;
-+
-+	if (mpp->eh_deadline == EH_DEADLINE_UNSET)
-+		return 0;
-+
-+	sprintf(host_name, "host%d", pp->sg_id.host_no);
-+	hostdev = udev_device_new_from_subsystem_sysname(udev,
-+			"scsi_host", host_name);
-+	if (!hostdev)
-+		return 1;
-+
-+	if (mpp->eh_deadline == EH_DEADLINE_OFF)
-+		sprintf(value, "off");
-+	else if (mpp->eh_deadline == EH_DEADLINE_ZERO)
-+		sprintf(value, "0");
-+	else
-+		snprintf(value, 16, "%u", mpp->eh_deadline);
-+
-+	ret = sysfs_attr_set_value(hostdev, "eh_deadline",
-+				   value, strlen(value));
-+	/*
-+	 * not all scsi drivers support setting eh_deadline, so failing
-+	 * is totally reasonable
-+	 */
-+	if (ret <= 0)
-+		condlog(4, "%s: failed to set eh_deadline to %s, error %d", udev_device_get_sysname(hostdev), value, -ret);
-+
-+	udev_device_unref(hostdev);
-+	return (ret <= 0);
-+}
-+
- static void
- sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
- {
-@@ -787,16 +823,24 @@ sysfs_set_scsi_tmo (struct multipath *mpp, unsigned int checkint)
- 			mpp->alias, mpp->fast_io_fail);
- 		mpp->fast_io_fail = MP_FAST_IO_FAIL_OFF;
- 	}
--	if (!mpp->dev_loss && mpp->fast_io_fail == MP_FAST_IO_FAIL_UNSET)
-+	if (!mpp->dev_loss && mpp->fast_io_fail == MP_FAST_IO_FAIL_UNSET &&
-+	    mpp->eh_deadline == EH_DEADLINE_UNSET)
- 		return 0;
- 
- 	vector_foreach_slot(mpp->paths, pp, i) {
--		if (pp->sg_id.proto_id == SCSI_PROTOCOL_FCP)
--			sysfs_set_rport_tmo(mpp, pp);
--		if (pp->sg_id.proto_id == SCSI_PROTOCOL_ISCSI)
--			sysfs_set_session_tmo(mpp, pp);
--		if (pp->sg_id.proto_id == SCSI_PROTOCOL_SAS)
--			sysfs_set_nexus_loss_tmo(mpp, pp);
-+		if (pp->bus != SYSFS_BUS_SCSI)
-+			continue;
-+
-+		if (mpp->dev_loss ||
-+		    mpp->fast_io_fail != MP_FAST_IO_FAIL_UNSET) {
-+			if (pp->sg_id.proto_id == SCSI_PROTOCOL_FCP)
-+				sysfs_set_rport_tmo(mpp, pp);
-+			else if (pp->sg_id.proto_id == SCSI_PROTOCOL_ISCSI)
-+				sysfs_set_session_tmo(mpp, pp);
-+			else if (pp->sg_id.proto_id == SCSI_PROTOCOL_SAS)
-+				sysfs_set_nexus_loss_tmo(mpp, pp);
-+		}
-+		sysfs_set_eh_deadline(mpp, pp);
- 	}
- 	return 0;
- }
-diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
-index 725db2b1..1150cfe8 100644
---- a/libmultipath/propsel.c
-+++ b/libmultipath/propsel.c
-@@ -776,6 +776,23 @@ out:
- 	return 0;
- }
- 
-+int select_eh_deadline(struct config *conf, struct multipath *mp)
-+{
-+	const char *origin;
-+	char buff[12];
-+
-+	mp_set_ovr(eh_deadline);
-+	mp_set_hwe(eh_deadline);
-+	mp_set_conf(eh_deadline);
-+	mp->eh_deadline = EH_DEADLINE_UNSET;
-+	/* not changing sysfs in default cause, so don't print anything */
-+	return 0;
-+out:
-+	print_undef_off_zero(buff, 12, mp->eh_deadline);
-+	condlog(3, "%s: eh_deadline = %s %s", mp->alias, buff, origin);
-+	return 0;
-+}
-+
- int select_flush_on_last_del(struct config *conf, struct multipath *mp)
- {
- 	const char *origin;
-diff --git a/libmultipath/propsel.h b/libmultipath/propsel.h
-index 3d6edd8a..a68bacf0 100644
---- a/libmultipath/propsel.h
-+++ b/libmultipath/propsel.h
-@@ -17,6 +17,7 @@ int select_uid(struct config *conf, struct multipath *mp);
- int select_gid(struct config *conf, struct multipath *mp);
- int select_fast_io_fail(struct config *conf, struct multipath *mp);
- int select_dev_loss(struct config *conf, struct multipath *mp);
-+int select_eh_deadline(struct config *conf, struct multipath *mp);
- int select_reservation_key(struct config *conf, struct multipath *mp);
- int select_retain_hwhandler (struct config *conf, struct multipath * mp);
- int select_detect_prio(struct config *conf, struct path * pp);
-diff --git a/libmultipath/structs.h b/libmultipath/structs.h
-index 29209984..65542dea 100644
---- a/libmultipath/structs.h
-+++ b/libmultipath/structs.h
-@@ -246,6 +246,12 @@ enum fast_io_fail_states {
- 	MP_FAST_IO_FAIL_ZERO = UOZ_ZERO,
- };
- 
-+enum eh_deadline_states {
-+	EH_DEADLINE_UNSET = UOZ_UNDEF,
-+	EH_DEADLINE_OFF = UOZ_OFF,
-+	EH_DEADLINE_ZERO = UOZ_ZERO,
-+};
-+
- struct vpd_vendor_page {
- 	int pg;
- 	const char *name;
-@@ -366,6 +372,7 @@ struct multipath {
- 	int ghost_delay;
- 	int ghost_delay_tick;
- 	unsigned int dev_loss;
-+	int eh_deadline;
- 	uid_t uid;
- 	gid_t gid;
- 	mode_t mode;
-diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
-index 6dc26f10..60954574 100644
---- a/multipath/multipath.conf.5
-+++ b/multipath/multipath.conf.5
-@@ -700,6 +700,22 @@ The default is: \fB600\fR
- .
- .
- .TP
-+.B eh_deadline
-+Specify the maximum number of seconds the SCSI layer will spend doing error
-+handling when scsi devices fail. After this timeout the scsi layer will perform
-+a full HBA reset. Setting this may be necessary in cases where the rport is
-+never lost, so \fIfast_io_fail_tmo\fR and \fIdev_loss_tmo\fR will never
-+trigger, but (frequently do to load) scsi commands still hang. \fBNote:\fR when
-+the scsi error handler performs the HBA reset, all target paths on that HBA
-+will be affected. eh_deadline should only be set in cases where all targets on
-+the affected HBAs are multipathed.
-+.RS
-+.TP
-+The default is: \fB<unset>\fR
-+.RE
-+.
-+.
-+.TP
- .B bindings_file
- The full pathname of the binding file to be used when the user_friendly_names
- option is set.
--- 
-2.17.2
-

SOURCES/0043-libmultipath-fix-printing-native-nvme-multipath-topo.patch

@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Benjamin Marzinski <bmarzins@redhat.com>
+Date: Wed, 16 Feb 2022 00:12:29 -0600
+Subject: [PATCH] libmultipath: fix printing native nvme multipath topology.
+
+Since commit 2f05df4 ("libmultipath: use strbuf in print.c"), when
+multipath prints the topology of native nvme devices, instead of
+printing the multipath device information, it prints "w [G]:d s". This
+is because nvme_style() switched from calling snprintf(), which supports
+format specifiers, to append_strbuf_str(), which doesn't, while still
+keeping the same string, "%%w [%%G]:%%d %%s". Remove the extra percent
+signs, since they don't need to be escaped in append_strbuf_str().
+
+Fixes: 2f05df4 ("libmultipath: use strbuf in print.c")
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+Reviewed-by: Martin Wilck <mwilck@suse.com>
+---
+ libmultipath/foreign/nvme.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libmultipath/foreign/nvme.c b/libmultipath/foreign/nvme.c
+index d40c0869..23355ca5 100644
+--- a/libmultipath/foreign/nvme.c
++++ b/libmultipath/foreign/nvme.c
+@@ -335,7 +335,7 @@ static int snprint_nvme_pg(const struct gen_pathgroup *gmp,
+ static int nvme_style(__attribute__((unused)) const struct gen_multipath* gm,
+ 		      struct strbuf *buf, __attribute__((unused)) int verbosity)
+ {
+-	return append_strbuf_str(buf, "%%w [%%G]:%%d %%s");
++	return append_strbuf_str(buf, "%w [%G]:%d %s");
+ }
+ 
+ static const struct gen_multipath_ops nvme_map_ops = {

SOURCES/0044-libmultipath-don-t-dlclose-tur-checker-DSO.patch

@@ -1,89 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Fri, 23 Oct 2020 11:38:24 -0500
-Subject: [PATCH] libmultipath: don't dlclose tur checker DSO
-
-The multipathd tur checker thread is designed to be able to finish at
-any time, even after the tur checker itself has been freed. The
-multipathd shutdown code makes sure all the checkers have been freed
-before freeing the checker_class and calling dlclose() to unload the
-DSO, but this doesn't guarantee that the checker threads have finished.
-If one hasn't, the DSO will get unloaded while the thread still running
-code from it, causing a segfault. Unfortunately, it's not possible to be
-sure that all tur checker threads have ended during shutdown, without
-making them joinable.
-
-However, since libmultipath will never be reinitialized after it has
-been uninitialzed, not dlclosing the tur checker DSO once a thread is
-started has minimal cost (keeping the DSO code around until the program
-exits, which usually happens right after freeing the checkers).
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/checkers.c     | 10 +++++++++-
- libmultipath/checkers.h     |  1 +
- libmultipath/checkers/tur.c |  1 +
- 3 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/libmultipath/checkers.c b/libmultipath/checkers.c
-index 8d2be8a9..6359e5d8 100644
---- a/libmultipath/checkers.c
-+++ b/libmultipath/checkers.c
-@@ -21,6 +21,7 @@ struct checker_class {
- 	void (*reset)(void);		     /* to reset the global variables */
- 	const char **msgtable;
- 	short msgtable_size;
-+	int keep_dso;
- };
- 
- char *checker_state_names[] = {
-@@ -69,7 +70,7 @@ void free_checker_class(struct checker_class *c)
- 	list_del(&c->node);
- 	if (c->reset)
- 		c->reset();
--	if (c->handle) {
-+	if (c->handle && !c->keep_dso) {
- 		if (dlclose(c->handle) != 0) {
- 			condlog(0, "Cannot unload checker %s: %s",
- 				c->name, dlerror());
-@@ -192,6 +193,13 @@ out:
- 	return NULL;
- }
- 
-+void checker_keep_dso(struct checker * c)
-+{
-+	if (!c || !c->cls)
-+		return;
-+	c->cls->keep_dso = 1;
-+}
-+
- void checker_set_fd (struct checker * c, int fd)
- {
- 	if (!c)
-diff --git a/libmultipath/checkers.h b/libmultipath/checkers.h
-index b458118d..f183cff9 100644
---- a/libmultipath/checkers.h
-+++ b/libmultipath/checkers.h
-@@ -145,6 +145,7 @@ void checker_reset (struct checker *);
- void checker_set_sync (struct checker *);
- void checker_set_async (struct checker *);
- void checker_set_fd (struct checker *, int);
-+void checker_keep_dso(struct checker *c);
- void checker_enable (struct checker *);
- void checker_disable (struct checker *);
- int checker_check (struct checker *, int);
-diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c
-index e886fcf8..fd58d62a 100644
---- a/libmultipath/checkers/tur.c
-+++ b/libmultipath/checkers/tur.c
-@@ -394,6 +394,7 @@ int libcheck_check(struct checker * c)
- 		uatomic_set(&ct->running, 1);
- 		tur_set_async_timeout(c);
- 		setup_thread_attr(&attr, 32 * 1024, 1);
-+		checker_keep_dso(c);
- 		r = pthread_create(&ct->thread, &attr, tur_thread, ct);
- 		pthread_attr_destroy(&attr);
- 		if (r) {
--- 
-2.17.2
-

SOURCES/0044-multipathd-Don-t-keep-starting-TUR-threads-if-they-a.patch

@@ -0,0 +1,86 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Benjamin Marzinski <bmarzins@redhat.com>
+Date: Tue, 29 Mar 2022 22:22:10 -0500
+Subject: [PATCH] multipathd: Don't keep starting TUR threads, if they always
+ hang.
+
+If tur thead hangs, multipathd was simply creating a new thread, and
+assuming that the old thread would get cleaned up eventually. I have
+seen a case recently where there were 26000 multipathd threads on a
+system, all stuck trying to send TUR commands to path devices. The root
+cause of the issue was a scsi kernel issue, but it shows that the way
+multipathd currently deals with stuck threads could use some refinement.
+
+Now, when one tur thread hangs, multipathd will act as it did before.
+If a second one in a row hangs, multipathd will instead wait for it to
+complete before starting another thread. Once the thread completes, the
+count is reset.
+
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+Reviewed-by: Martin Wilck <mwilck@suse.com
+---
+ libmultipath/checkers/tur.c | 23 +++++++++++++++++++++--
+ 1 file changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c
+index a4b4a213..d82f7dbc 100644
+--- a/libmultipath/checkers/tur.c
++++ b/libmultipath/checkers/tur.c
+@@ -27,6 +27,7 @@
+ 
+ #define TUR_CMD_LEN 6
+ #define HEAVY_CHECK_COUNT       10
++#define MAX_NR_TIMEOUTS 1
+ 
+ enum {
+ 	MSG_TUR_RUNNING = CHECKER_FIRST_MSGID,
+@@ -55,6 +56,7 @@ struct tur_checker_context {
+ 	int holders; /* uatomic access only */
+ 	int msgid;
+ 	struct checker_context ctx;
++	unsigned int nr_timeouts;
+ };
+ 
+ int libcheck_init (struct checker * c)
+@@ -359,8 +361,23 @@ int libcheck_check(struct checker * c)
+ 		}
+ 	} else {
+ 		if (uatomic_read(&ct->holders) > 1) {
++			/* The thread has been cancelled but hasn't quit. */
++			if (ct->nr_timeouts == MAX_NR_TIMEOUTS) {
++				condlog(2, "%d:%d : waiting for stalled tur thread to finish",
++					major(ct->devt), minor(ct->devt));
++				ct->nr_timeouts++;
++			}
+ 			/*
+-			 * The thread has been cancelled but hasn't quit.
++			 * Don't start new threads until the last once has
++			 * finished.
++			 */
++			if (ct->nr_timeouts > MAX_NR_TIMEOUTS) {
++				c->msgid = MSG_TUR_TIMEOUT;
++				return PATH_TIMEOUT;
++			}
++			ct->nr_timeouts++;
++			/*
++			 * Start a new thread while the old one is stalled.
+ 			 * We have to prevent it from interfering with the new
+ 			 * thread. We create a new context and leave the old
+ 			 * one with the stale thread, hoping it will clean up
+@@ -376,13 +393,15 @@ int libcheck_check(struct checker * c)
+ 			 */
+ 			if (libcheck_init(c) != 0)
+ 				return PATH_UNCHECKED;
++			((struct tur_checker_context *)c->context)->nr_timeouts = ct->nr_timeouts;
+ 
+ 			if (!uatomic_sub_return(&ct->holders, 1))
+ 				/* It did terminate, eventually */
+ 				cleanup_context(ct);
+ 
+ 			ct = c->context;
+-		}
++		} else
++			ct->nr_timeouts = 0;
+ 		/* Start new TUR checker */
+ 		pthread_mutex_lock(&ct->lock);
+ 		tur_status = ct->state = PATH_PENDING;

SOURCES/0045-libmultipath-warn-about-missing-braces-at-end-of-mul.patch

@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Mon, 16 Nov 2020 13:52:09 -0600
-Subject: [PATCH] libmultipath: warn about missing braces at end of
- multipath.conf
-
-Multipath doesn't warn when multipath.conf is missing closing braces at
-the end of the file. This has confused people about the correct config
-file syntax, so add a warning.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/parser.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/libmultipath/parser.c b/libmultipath/parser.c
-index a7285a35..48b54e87 100644
---- a/libmultipath/parser.c
-+++ b/libmultipath/parser.c
-@@ -544,7 +544,7 @@ process_stream(struct config *conf, FILE *stream, vector keywords, char *file)
- 		if (!strcmp(str, EOB)) {
- 			if (kw_level > 0) {
- 				free_strvec(strvec);
--				break;
-+				goto out;
- 			}
- 			condlog(0, "unmatched '%s' at line %d of %s",
- 				EOB, line_nr, file);
-@@ -583,7 +583,8 @@ process_stream(struct config *conf, FILE *stream, vector keywords, char *file)
- 
- 		free_strvec(strvec);
- 	}
--
-+	if (kw_level == 1)
-+		condlog(1, "missing '%s' at end of %s", EOB, file);
- out:
- 	FREE(buf);
- 	free_uniques(uniques);
--- 
-2.17.2
-

SOURCES/0045-multipath-tools-update-mpp-force_readonly-in-ev_add_.patch

@@ -40,10 +40,10 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
-index 3f70e576..e3c3c119 100644
+index c05dc201..1ff75c81 100644
 --- a/libmultipath/devmapper.c
 +++ b/libmultipath/devmapper.c
-@@ -420,7 +420,7 @@ int dm_addmap_create (struct multipath *mpp, char * params)
+@@ -542,7 +542,7 @@ int dm_addmap_create (struct multipath *mpp, char * params)
  	int ro;
  	uint16_t udev_flags = build_udev_flags(mpp, 0);
  
@@ -53,10 +53,10 @@ index 3f70e576..e3c3c119 100644
  
  		if (dm_addmap(DM_DEVICE_CREATE, TGT_MPATH, mpp, params, ro,
 diff --git a/multipathd/main.c b/multipathd/main.c
-index f4b79882..eeded52b 100644
+index 45b9572f..ed2515e5 100644
 --- a/multipathd/main.c
 +++ b/multipathd/main.c
-@@ -988,6 +988,7 @@ ev_add_path (struct path * pp, struct vectors * vecs, int need_do_map)
+@@ -1048,6 +1048,7 @@ ev_add_path (struct path * pp, struct vectors * vecs, int need_do_map)
  	int retries = 3;
  	int start_waiter = 0;
  	int ret;
@@ -64,7 +64,7 @@ index f4b79882..eeded52b 100644
  
  	/*
  	 * need path UID to go any further
-@@ -1051,6 +1052,11 @@ rescan:
+@@ -1112,6 +1113,11 @@ rescan:
  	/* persistent reservation check*/
  	mpath_pr_event_handle(pp);
  

SOURCES/0046-libmultipath-ignore-multipaths-sections-without-wwid.patch

@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Mon, 16 Nov 2020 16:38:21 -0600
-Subject: [PATCH] libmultipath: ignore multipaths sections without wwid option
-
-"multipathd show config local" was crashing in find_mp_by_wwid() if
-the multipath configuration included a multipaths section that did
-not set a wwid option. There is no reason to keep a mpentry that
-didn't set its wwid. Remove it in merge_mptable().
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/config.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/libmultipath/config.c b/libmultipath/config.c
-index a71db2d0..dc81c994 100644
---- a/libmultipath/config.c
-+++ b/libmultipath/config.c
-@@ -444,6 +444,13 @@ void merge_mptable(vector mptable)
- 	int i, j;
- 
- 	vector_foreach_slot(mptable, mp1, i) {
-+		/* drop invalid multipath configs */
-+		if (!mp1->wwid) {
-+			condlog(0, "multipaths config section missing wwid");
-+			vector_del_slot(mptable, i--);
-+			free_mpe(mp1);
-+			continue;
-+		}
- 		j = i + 1;
- 		vector_foreach_slot_after(mptable, mp2, j) {
- 			if (strcmp(mp1->wwid, mp2->wwid))
--- 
-2.17.2
-

SOURCES/0046-multipath-return-failure-on-an-invalid-remove-comman.patch

@@ -18,10 +18,10 @@ Reviewed-by: Martin Wilck <mwilck@suse.com
  1 file changed, 5 insertions(+)
 
 diff --git a/multipath/main.c b/multipath/main.c
-index 14d045c9..d5e6499c 100644
+index 80fa68e5..41d01c7e 100644
 --- a/multipath/main.c
 +++ b/multipath/main.c
-@@ -1150,6 +1150,11 @@ main (int argc, char *argv[])
+@@ -1111,6 +1111,11 @@ main (int argc, char *argv[])
  	if (retries < 0)
  		retries = conf->remove_retries;
  	if (cmd == CMD_FLUSH_ONE) {

SOURCES/0047-libmultipath-steal-the-src-string-pointer-in-merge_s.patch

@@ -14,10 +14,10 @@ Reviewed-by: Martin Wilck <mwilck@suse.com>
  1 file changed, 5 insertions(+), 11 deletions(-)
 
 diff --git a/libmultipath/config.c b/libmultipath/config.c
-index abbddaf1..aa79561e 100644
+index cee3bbb7..005d6b54 100644
 --- a/libmultipath/config.c
 +++ b/libmultipath/config.c
-@@ -323,9 +323,9 @@ set_param_str(const char * str)
+@@ -388,9 +388,9 @@ set_param_str(const char * str)
  }
  
  #define merge_str(s) \
@@ -30,7 +30,7 @@ index abbddaf1..aa79561e 100644
  	}
  
  #define merge_num(s) \
-@@ -333,7 +333,7 @@ set_param_str(const char * str)
+@@ -398,7 +398,7 @@ set_param_str(const char * str)
  		dst->s = src->s
  
  
@@ -39,7 +39,7 @@ index abbddaf1..aa79561e 100644
  merge_hwe (struct hwentry * dst, struct hwentry * src)
  {
  	char id[SCSI_VENDOR_SIZE+PATH_PRODUCT_SIZE];
-@@ -385,15 +385,11 @@ merge_hwe (struct hwentry * dst, struct hwentry * src)
+@@ -450,15 +450,11 @@ merge_hwe (struct hwentry * dst, struct hwentry * src)
  	reconcile_features_with_options(id, &dst->features,
  					&dst->no_path_retry,
  					&dst->retain_hwhandler);
@@ -56,7 +56,7 @@ index abbddaf1..aa79561e 100644
  	merge_str(alias);
  	merge_str(uid_attribute);
  	merge_str(getuid);
-@@ -435,8 +431,6 @@ merge_mpe(struct mpentry *dst, struct mpentry *src)
+@@ -500,8 +496,6 @@ merge_mpe(struct mpentry *dst, struct mpentry *src)
  	merge_num(uid);
  	merge_num(gid);
  	merge_num(mode);

SOURCES/0047-tests-fix-missing-priority-blacklist-test.patch

@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Mon, 16 Nov 2020 23:21:41 -0600
-Subject: [PATCH] tests: fix missing priority blacklist test
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- tests/blacklist.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tests/blacklist.c b/tests/blacklist.c
-index d20e97af..401600d9 100644
---- a/tests/blacklist.c
-+++ b/tests/blacklist.c
-@@ -378,7 +378,6 @@ static void test_property_missing(void **state)
- {
- 	static struct udev_device udev = { "sdb", { "ID_FOO", "ID_BAZ", "ID_BAR", "ID_SERIAL", NULL } };
- 	conf.blist_property = blist_property_wwn;
--	expect_condlog(3, "sdb: blacklisted, udev property missing\n");
- 	assert_int_equal(filter_property(&conf, &udev, 3, "ID_SERIAL"),
- 			 MATCH_NOTHING);
- 	assert_int_equal(filter_property(&conf, &udev, 3, "ID_BLAH"),
--- 
-2.17.2
-

SOURCES/0048-libmultipath-enable-linear-ordering-of-bus-proto-tup.patch

@@ -13,14 +13,14 @@ Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
  libmultipath/structs.c | 10 ++++++++++
- libmultipath/structs.h | 14 ++++++++++++--
+ libmultipath/structs.h | 13 +++++++++++--
- 2 files changed, 22 insertions(+), 2 deletions(-)
+ 2 files changed, 21 insertions(+), 2 deletions(-)
 
 diff --git a/libmultipath/structs.c b/libmultipath/structs.c
-index dda9884c..aaf85297 100644
+index 6e5a1038..2b7cde0c 100644
 --- a/libmultipath/structs.c
 +++ b/libmultipath/structs.c
-@@ -722,3 +722,13 @@ out:
+@@ -758,3 +758,13 @@ out:
  
  	return 0;
  }
@@ -35,10 +35,10 @@ index dda9884c..aaf85297 100644
 +	return SYSFS_BUS_SCSI + pp->sg_id.proto_id;
 +}
 diff --git a/libmultipath/structs.h b/libmultipath/structs.h
-index a5dbad5b..5e29ae38 100644
+index 1188363e..45294f11 100644
 --- a/libmultipath/structs.h
 +++ b/libmultipath/structs.h
-@@ -57,12 +57,13 @@ enum failback_mode {
+@@ -56,12 +56,13 @@ enum failback_mode {
  	FAILBACK_FOLLOWOVER
  };
  
@@ -53,12 +53,11 @@ index a5dbad5b..5e29ae38 100644
  };
  
  enum pathstates {
-@@ -190,9 +191,18 @@ enum scsi_protocol {
+@@ -180,9 +181,17 @@ enum scsi_protocol {
- 	SCSI_PROTOCOL_SAS = 6,
  	SCSI_PROTOCOL_ADT = 7,	/* Media Changers */
  	SCSI_PROTOCOL_ATA = 8,
+ 	SCSI_PROTOCOL_USB = 9,  /* USB Attached SCSI (UAS), and others */
 -	SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */
-+	SCSI_PROTOCOL_USB = 9,  /* USB Attached SCSI (UAS), and others */
 +	SCSI_PROTOCOL_UNSPEC = 0xa, /* No specific protocol */
  };
  
@@ -70,6 +69,6 @@ index a5dbad5b..5e29ae38 100644
 +#define LAST_BUS_PROTOCOL_ID (SYSFS_BUS_SCSI + SCSI_PROTOCOL_UNSPEC)
 +unsigned int bus_protocol_id(const struct path *pp);
 +
+ #define SCSI_INVALID_LUN ~0ULL
+ 
  enum no_undef_states {
- 	NU_NO = -1,
- 	NU_UNDEF = 0,

SOURCES/0048-mpathpersist-Fix-Register-and-Ignore-with-0x00-SARK.patch

@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Thu, 5 Nov 2020 09:15:43 -0600
-Subject: [PATCH] mpathpersist: Fix Register and Ignore with 0x00 SARK
-
-When the Register and Ignore command is run with sg_persist, if a 0x00
-Service Action Reservation Key is given or the --param-sark option is
-not used at all, sg_persist will clear the registration.  mpathpersist
-will fail with an error.  This patch fixes mpathpersist to work like
-sg_persist in this case.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmpathpersist/mpath_persist.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libmpathpersist/mpath_persist.c b/libmpathpersist/mpath_persist.c
-index 3da7a6cf..aa196008 100644
---- a/libmpathpersist/mpath_persist.c
-+++ b/libmpathpersist/mpath_persist.c
-@@ -321,7 +321,8 @@ int __mpath_persistent_reserve_out ( int fd, int rq_servact, int rq_scope,
- 	}
- 
- 	if (memcmp(paramp->key, &mpp->reservation_key, 8) &&
--	    memcmp(paramp->sa_key, &mpp->reservation_key, 8)) {
-+	    memcmp(paramp->sa_key, &mpp->reservation_key, 8) &&
-+	    (prkey || rq_servact != MPATH_PROUT_REG_IGN_SA)) {
- 		condlog(0, "%s: configured reservation key doesn't match: 0x%" PRIx64, alias, get_be64(mpp->reservation_key));
- 		ret = MPATH_PR_SYNTAX_ERROR;
- 		goto out1;
--- 
-2.17.2
-

SOURCES/0049-libmultipath-use-bus_protocol_id-in-snprint_path_pro.patch

@@ -10,51 +10,53 @@ Signed-off-by: Martin Wilck <mwilck@suse.com>
 Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
- libmultipath/print.c | 56 +++++++++++++++++---------------------------
+ libmultipath/print.c | 58 ++++++++++++++++----------------------------
- 1 file changed, 21 insertions(+), 35 deletions(-)
+ 1 file changed, 21 insertions(+), 37 deletions(-)
 
 diff --git a/libmultipath/print.c b/libmultipath/print.c
-index 298b3764..ff4d1854 100644
+index 2fb9f4ef..8f1b18db 100644
 --- a/libmultipath/print.c
 +++ b/libmultipath/print.c
-@@ -662,41 +662,27 @@ snprint_path_failures(char * buff, size_t len, const struct path * pp)
+@@ -696,43 +696,27 @@ snprint_path_failures(struct strbuf *buff, const struct path * pp)
  int
- snprint_path_protocol(char * buff, size_t len, const struct path * pp)
+ snprint_path_protocol(struct strbuf *buff, const struct path * pp)
  {
 -	switch (pp->bus) {
 -	case SYSFS_BUS_SCSI:
 -		switch (pp->sg_id.proto_id) {
 -		case SCSI_PROTOCOL_FCP:
--			return snprintf(buff, len, "scsi:fcp");
+-			return append_strbuf_str(buff, "scsi:fcp");
 -		case SCSI_PROTOCOL_SPI:
--			return snprintf(buff, len, "scsi:spi");
+-			return append_strbuf_str(buff, "scsi:spi");
 -		case SCSI_PROTOCOL_SSA:
--			return snprintf(buff, len, "scsi:ssa");
+-			return append_strbuf_str(buff, "scsi:ssa");
 -		case SCSI_PROTOCOL_SBP:
--			return snprintf(buff, len, "scsi:sbp");
+-			return append_strbuf_str(buff, "scsi:sbp");
 -		case SCSI_PROTOCOL_SRP:
--			return snprintf(buff, len, "scsi:srp");
+-			return append_strbuf_str(buff, "scsi:srp");
 -		case SCSI_PROTOCOL_ISCSI:
--			return snprintf(buff, len, "scsi:iscsi");
+-			return append_strbuf_str(buff, "scsi:iscsi");
 -		case SCSI_PROTOCOL_SAS:
--			return snprintf(buff, len, "scsi:sas");
+-			return append_strbuf_str(buff, "scsi:sas");
 -		case SCSI_PROTOCOL_ADT:
--			return snprintf(buff, len, "scsi:adt");
+-			return append_strbuf_str(buff, "scsi:adt");
 -		case SCSI_PROTOCOL_ATA:
--			return snprintf(buff, len, "scsi:ata");
+-			return append_strbuf_str(buff, "scsi:ata");
+-		case SCSI_PROTOCOL_USB:
+-			return append_strbuf_str(buff, "scsi:usb");
 -		case SCSI_PROTOCOL_UNSPEC:
 -		default:
--			return snprintf(buff, len, "scsi:unspec");
+-			return append_strbuf_str(buff, "scsi:unspec");
 -		}
 -	case SYSFS_BUS_CCW:
--		return snprintf(buff, len, "ccw");
+-		return append_strbuf_str(buff, "ccw");
 -	case SYSFS_BUS_CCISS:
--		return snprintf(buff, len, "cciss");
+-		return append_strbuf_str(buff, "cciss");
 -	case SYSFS_BUS_NVME:
--		return snprintf(buff, len, "nvme");
+-		return append_strbuf_str(buff, "nvme");
 -	case SYSFS_BUS_UNDEF:
 -	default:
--		return snprintf(buff, len, "undef");
+-		return append_strbuf_str(buff, "undef");
 -	}
 +	static const char * const protocol_name[LAST_BUS_PROTOCOL_ID + 1] = {
 +		[SYSFS_BUS_UNDEF] = "undef",
@@ -76,7 +78,7 @@ index 298b3764..ff4d1854 100644
 +	const char *pn = protocol_name[bus_protocol_id(pp)];
 +
 +	assert(pn != NULL);
-+	return snprintf(buff, len, "%s", pn);
++	return append_strbuf_str(buff, pn);
  }
  
  int

SOURCES/0049-mpathpersist-update-prkeys-file-on-changing-registra.patch

@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Mon, 23 Nov 2020 20:45:50 -0600
-Subject: [PATCH] mpathpersist: update prkeys file on changing registrations
-
-When the "reservation_key" option is set to "file" and Register command
-is run with both the current Reservation Key and a new Service Action
-Reservation Key, mpathpersist will change the registration, but will not
-update the prkeys file. This means that future paths that come online
-will not be able to register, since multipathd is still using the old
-reservation key. Fix this.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmpathpersist/mpath_persist.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/libmpathpersist/mpath_persist.c b/libmpathpersist/mpath_persist.c
-index aa196008..a01dfb0b 100644
---- a/libmpathpersist/mpath_persist.c
-+++ b/libmpathpersist/mpath_persist.c
-@@ -307,9 +307,10 @@ int __mpath_persistent_reserve_out ( int fd, int rq_servact, int rq_scope,
- 
- 	memcpy(&prkey, paramp->sa_key, 8);
- 	if (mpp->prkey_source == PRKEY_SOURCE_FILE && prkey &&
--	    ((!get_be64(mpp->reservation_key) &&
--	      rq_servact == MPATH_PROUT_REG_SA) ||
--	     rq_servact == MPATH_PROUT_REG_IGN_SA)) {
-+	    (rq_servact == MPATH_PROUT_REG_IGN_SA ||
-+	     (rq_servact == MPATH_PROUT_REG_SA &&
-+	      (!get_be64(mpp->reservation_key) ||
-+	       memcmp(paramp->key, &mpp->reservation_key, 8) == 0)))) {
- 		memcpy(&mpp->reservation_key, paramp->sa_key, 8);
- 		if (update_prkey_flags(alias, get_be64(mpp->reservation_key),
- 				       paramp->sa_flags)) {
--- 
-2.17.2
-

SOURCES/0050-libmultipath-make-protocol_name-global.patch

@@ -15,12 +15,12 @@ Reviewed-by: Martin Wilck <mwilck@suse.com>
  3 files changed, 19 insertions(+), 17 deletions(-)
 
 diff --git a/libmultipath/print.c b/libmultipath/print.c
-index ff4d1854..1f6d27bd 100644
+index 8f1b18db..0dbd34e4 100644
 --- a/libmultipath/print.c
 +++ b/libmultipath/print.c
-@@ -662,23 +662,6 @@ snprint_path_failures(char * buff, size_t len, const struct path * pp)
+@@ -696,23 +696,6 @@ snprint_path_failures(struct strbuf *buff, const struct path * pp)
  int
- snprint_path_protocol(char * buff, size_t len, const struct path * pp)
+ snprint_path_protocol(struct strbuf *buff, const struct path * pp)
  {
 -	static const char * const protocol_name[LAST_BUS_PROTOCOL_ID + 1] = {
 -		[SYSFS_BUS_UNDEF] = "undef",
@@ -43,7 +43,7 @@ index ff4d1854..1f6d27bd 100644
  
  	assert(pn != NULL);
 diff --git a/libmultipath/structs.c b/libmultipath/structs.c
-index aaf85297..19099bed 100644
+index 2b7cde0c..d20e1eea 100644
 --- a/libmultipath/structs.c
 +++ b/libmultipath/structs.c
 @@ -20,6 +20,24 @@
@@ -72,14 +72,14 @@ index aaf85297..19099bed 100644
  alloc_adaptergroup(void)
  {
 diff --git a/libmultipath/structs.h b/libmultipath/structs.h
-index 5e29ae38..ab99852f 100644
+index 45294f11..618ff4fb 100644
 --- a/libmultipath/structs.h
 +++ b/libmultipath/structs.h
-@@ -202,6 +202,7 @@ enum scsi_protocol {
+@@ -191,6 +191,7 @@ enum scsi_protocol {
   */
  #define LAST_BUS_PROTOCOL_ID (SYSFS_BUS_SCSI + SCSI_PROTOCOL_UNSPEC)
  unsigned int bus_protocol_id(const struct path *pp);
 +extern const char * const protocol_name[];
  
- enum no_undef_states {
+ #define SCSI_INVALID_LUN ~0ULL
- 	NU_NO = -1,
+ 

SOURCES/0050-multipathd-Fix-multipathd-stopping-on-shutdown.patch

@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Mon, 14 Dec 2020 14:16:29 -0600
-Subject: [PATCH] multipathd: Fix multipathd stopping on shutdown
-
-According to man "systemd.special"
-
-"shutdown.target: ... Services that shall be terminated on system
-shutdown shall add Conflicts= and Before= dependencies to this unit for
-their service unit, which is implicitly done when
-DefaultDependencies=yes is set (the default)."
-
-multipathd.service sets DefaultDependencies=no and includes the
-Conflits= dependency, but not the Before= one. This can cause multipathd
-to continue running past when it is supposed to during shutdown.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- multipathd/multipathd.service | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service
-index 0fbcc46b..bc8fa07a 100644
---- a/multipathd/multipathd.service
-+++ b/multipathd/multipathd.service
-@@ -2,7 +2,7 @@
- Description=Device-Mapper Multipath Device Controller
- Wants=systemd-udev-trigger.service systemd-udev-settle.service
- Before=iscsi.service iscsid.service lvm2-activation-early.service
--Before=local-fs-pre.target blk-availability.service
-+Before=local-fs-pre.target blk-availability.service shutdown.target
- After=multipathd.socket systemd-udev-trigger.service systemd-udev-settle.service
- ConditionPathExists=/etc/multipath.conf
- DefaultDependencies=no
--- 
-2.17.2
-

SOURCES/0051-libmultipath-add-a-protocol-subsection-to-multipath..patch

@@ -17,14 +17,14 @@ Reviewed-by: Martin Wilck <mwilck@suse.com>
  libmultipath/config.c | 83 ++++++++++++++++++++++++++++++++++++
  libmultipath/config.h | 10 +++++
  libmultipath/dict.c   | 99 +++++++++++++++++++++++++++++++++++++++++++
- libmultipath/print.c  | 44 +++++++++++++++++++
+ libmultipath/print.c  | 50 ++++++++++++++++++++++
- 4 files changed, 236 insertions(+)
+ 4 files changed, 242 insertions(+)
 
 diff --git a/libmultipath/config.c b/libmultipath/config.c
-index aa79561e..88975323 100644
+index 005d6b54..8b0e1f72 100644
 --- a/libmultipath/config.c
 +++ b/libmultipath/config.c
-@@ -173,6 +173,18 @@ char *get_mpe_wwid(vector mptable, char *alias)
+@@ -238,6 +238,18 @@ const char *get_mpe_wwid(const struct _vector *mptable, const char *alias)
  	return NULL;
  }
  
@@ -43,7 +43,7 @@ index aa79561e..88975323 100644
  void
  free_hwe (struct hwentry * hwe)
  {
-@@ -218,6 +230,9 @@ free_hwe (struct hwentry * hwe)
+@@ -283,6 +295,9 @@ free_hwe (struct hwentry * hwe)
  	if (hwe->bl_product)
  		FREE(hwe->bl_product);
  
@@ -53,7 +53,7 @@ index aa79561e..88975323 100644
  	FREE(hwe);
  }
  
-@@ -299,6 +314,15 @@ alloc_hwe (void)
+@@ -364,6 +379,15 @@ alloc_hwe (void)
  	return hwe;
  }
  
@@ -69,7 +69,7 @@ index aa79561e..88975323 100644
  static char *
  set_param_str(const char * str)
  {
-@@ -332,6 +356,13 @@ set_param_str(const char * str)
+@@ -397,6 +421,13 @@ set_param_str(const char * str)
  	if (!dst->s && src->s) \
  		dst->s = src->s
  
@@ -83,7 +83,7 @@ index aa79561e..88975323 100644
  
  static void
  merge_hwe (struct hwentry * dst, struct hwentry * src)
-@@ -538,6 +569,51 @@ out:
+@@ -603,6 +634,51 @@ out:
  	return 1;
  }
  
@@ -135,7 +135,7 @@ index aa79561e..88975323 100644
  static void
  factorize_hwtable (vector hw, int n, const char *table_desc)
  {
-@@ -666,6 +742,7 @@ process_config_dir(struct config *conf, char *dir)
+@@ -751,6 +827,7 @@ process_config_dir(struct config *conf, char *dir)
  	int i, n;
  	char path[LINE_MAX];
  	int old_hwtable_size;
@@ -143,7 +143,7 @@ index aa79561e..88975323 100644
  
  	if (dir[0] != '/') {
  		condlog(1, "config_dir '%s' must be a fully qualified path",
-@@ -692,11 +769,15 @@ process_config_dir(struct config *conf, char *dir)
+@@ -777,11 +854,15 @@ process_config_dir(struct config *conf, char *dir)
  			continue;
  
  		old_hwtable_size = VECTOR_SIZE(conf->hwtable);
@@ -159,7 +159,7 @@ index aa79561e..88975323 100644
  	}
  	pthread_cleanup_pop(1);
  }
-@@ -784,6 +865,7 @@ load_config (char * file)
+@@ -889,6 +970,7 @@ int _init_config (const char *file, struct config *conf)
  			goto out;
  		}
  		factorize_hwtable(conf->hwtable, builtin_hwtable_size, file);
@@ -167,7 +167,7 @@ index aa79561e..88975323 100644
  	} else {
  		condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices.");
  		condlog(0, "You can run \"/sbin/mpathconf --enable\" to create");
-@@ -898,6 +980,7 @@ load_config (char * file)
+@@ -1004,6 +1086,7 @@ int _init_config (const char *file, struct config *conf)
  			goto out;
  	}
  
@@ -176,7 +176,7 @@ index aa79561e..88975323 100644
  	merge_blacklist(conf->blist_devnode);
  	merge_blacklist(conf->blist_property);
 diff --git a/libmultipath/config.h b/libmultipath/config.h
-index e2e3f143..143116b3 100644
+index 5f01c1fc..57992604 100644
 --- a/libmultipath/config.h
 +++ b/libmultipath/config.h
 @@ -41,6 +41,13 @@ enum force_reload_types {
@@ -202,7 +202,7 @@ index e2e3f143..143116b3 100644
  };
  
  struct mpentry {
-@@ -240,6 +249,7 @@ char * get_mpe_wwid (vector mptable, char * alias);
+@@ -286,6 +295,7 @@ const char *get_mpe_wwid (const struct _vector *mptable, const char *alias);
  
  struct hwentry * alloc_hwe (void);
  struct mpentry * alloc_mpe (void);
@@ -211,11 +211,11 @@ index e2e3f143..143116b3 100644
  void free_hwe (struct hwentry * hwe);
  void free_hwtable (vector hwtable);
 diff --git a/libmultipath/dict.c b/libmultipath/dict.c
-index 5a0255b0..8321ec1e 100644
+index eb5a8083..46b9f225 100644
 --- a/libmultipath/dict.c
 +++ b/libmultipath/dict.c
-@@ -457,6 +457,29 @@ snprint_mp_ ## option (struct config *conf, char * buff, int len,	\
+@@ -414,6 +414,29 @@ snprint_mp_ ## option (struct config *conf, struct strbuf *buff,	\
- 	return function (buff, len, mpe->option);			\
+ 	return function(buff, mpe->option);				\
  }
  
 +#define declare_pc_handler(option, function)				\
@@ -234,17 +234,17 @@ index 5a0255b0..8321ec1e 100644
 +
 +#define declare_pc_snprint(option, function)				\
 +static int								\
-+snprint_pc_ ## option (struct config *conf, char * buff, int len,	\
++snprint_pc_ ## option (struct config *conf, struct strbuf *buff,	\
 +		       const void *data)				\
 +{									\
 +	const struct pcentry *pce  = (const struct pcentry *)data;	\
-+	return function(buff, len, pce->option);			\
++	return function(buff, pce->option);				\
 +}
 +
  static int checkint_handler(struct config *conf, vector strvec,
  			    const char *file, int line_nr)
  {
-@@ -1022,6 +1045,8 @@ declare_ovr_handler(fast_io_fail, set_undef_off_zero)
+@@ -1038,6 +1061,8 @@ declare_ovr_handler(fast_io_fail, set_undef_off_zero)
  declare_ovr_snprint(fast_io_fail, print_undef_off_zero)
  declare_hw_handler(fast_io_fail, set_undef_off_zero)
  declare_hw_snprint(fast_io_fail, print_undef_off_zero)
@@ -253,7 +253,7 @@ index 5a0255b0..8321ec1e 100644
  
  static int
  set_dev_loss(vector strvec, void *ptr, const char *file, int line_nr)
-@@ -1059,6 +1084,8 @@ declare_ovr_handler(dev_loss, set_dev_loss)
+@@ -1075,6 +1100,8 @@ declare_ovr_handler(dev_loss, set_dev_loss)
  declare_ovr_snprint(dev_loss, print_dev_loss)
  declare_hw_handler(dev_loss, set_dev_loss)
  declare_hw_snprint(dev_loss, print_dev_loss)
@@ -262,7 +262,7 @@ index 5a0255b0..8321ec1e 100644
  
  declare_def_handler(eh_deadline, set_undef_off_zero)
  declare_def_snprint(eh_deadline, print_undef_off_zero)
-@@ -1066,6 +1093,8 @@ declare_ovr_handler(eh_deadline, set_undef_off_zero)
+@@ -1082,6 +1109,8 @@ declare_ovr_handler(eh_deadline, set_undef_off_zero)
  declare_ovr_snprint(eh_deadline, print_undef_off_zero)
  declare_hw_handler(eh_deadline, set_undef_off_zero)
  declare_hw_snprint(eh_deadline, print_undef_off_zero)
@@ -271,7 +271,7 @@ index 5a0255b0..8321ec1e 100644
  
  static int
  set_pgpolicy(vector strvec, void *ptr, const char *file, int line_nr)
-@@ -1876,6 +1905,69 @@ declare_mp_snprint(wwid, print_str)
+@@ -1889,6 +1918,69 @@ declare_mp_snprint(wwid, print_str)
  declare_mp_handler(alias, set_str_noslash)
  declare_mp_snprint(alias, print_str)
  
@@ -328,11 +328,11 @@ index 5a0255b0..8321ec1e 100644
 +}
 +
 +static int
-+print_protocol_type(char *buff, int len, int type)
++print_protocol_type(struct strbuf *buff, int type)
 +{
 +	if (type < 0)
 +		return 0;
-+	return snprintf(buff, len, "\"%s\"", protocol_name[type]);
++	return append_strbuf_quoted(buff, protocol_name[type]);
 +}
 +
 +declare_pc_handler(type, set_protocol_type)
@@ -341,7 +341,7 @@ index 5a0255b0..8321ec1e 100644
  /*
   * deprecated handlers
   */
-@@ -2117,6 +2209,13 @@ init_keywords(vector keywords)
+@@ -2130,6 +2222,13 @@ init_keywords(vector keywords)
  	install_keyword("ghost_delay", &ovr_ghost_delay_handler, &snprint_ovr_ghost_delay);
  	install_keyword("all_tg_pt", &ovr_all_tg_pt_handler, &snprint_ovr_all_tg_pt);
  	install_keyword("recheck_wwid", &ovr_recheck_wwid_handler, &snprint_ovr_recheck_wwid);
@@ -356,64 +356,70 @@ index 5a0255b0..8321ec1e 100644
  	install_keyword_root("multipaths", &multipaths_handler);
  	install_keyword_multi("multipath", &multipath_handler, NULL);
 diff --git a/libmultipath/print.c b/libmultipath/print.c
-index 1f6d27bd..8a6fbe83 100644
+index 0dbd34e4..46e3d32e 100644
 --- a/libmultipath/print.c
 +++ b/libmultipath/print.c
-@@ -1392,6 +1392,39 @@ snprint_multipath_topology_json (char * buff, int len, const struct vectors * ve
+@@ -1318,6 +1318,52 @@ int snprint_multipath_topology_json (struct strbuf *buff,
- 	return fwd;
+ 	return get_strbuf_len(buff) - initial_len;
  }
  
 +static int
-+snprint_pcentry (const struct config *conf, char *buff, int len,
++snprint_pcentry (const struct config *conf, struct strbuf *buff,
 +		 const struct pcentry *pce)
 +{
-+	int i;
++	int i, rc;
-+	int fwd = 0;
 +	struct keyword *kw;
 +	struct keyword * rootkw;
++	size_t initial_len = get_strbuf_len(buff);
 +
 +	rootkw = find_keyword(conf->keywords, NULL, "overrides");
-+	if (!rootkw || !rootkw->sub)
++	assert(rootkw && rootkw->sub);
-+		return 0;
-+
 +	rootkw = find_keyword(conf->keywords, rootkw->sub, "protocol");
-+	if (!rootkw)
++	assert(rootkw);
-+		return 0;
 +
-+	fwd += snprintf(buff + fwd, len - fwd, "\tprotocol {\n");
++	if ((rc = append_strbuf_str(buff, "\tprotocol {\n")) < 0)
-+	if (fwd >= len)
++		return rc;
-+		return len;
 +
 +	iterate_sub_keywords(rootkw, kw, i) {
-+		fwd += snprint_keyword(buff + fwd, len - fwd, "\t\t%k %v\n",
++		if ((rc = snprint_keyword(buff, "\t\t%k %v\n", kw, pce)) < 0)
-+				kw, pce);
++			return rc;
-+		if (fwd >= len)
-+			return len;
-+	}
-+	fwd += snprintf(buff + fwd, len - fwd, "\t}\n");
-+	if (fwd >= len)
-+		return len;
-+	return fwd;
 +	}
 +
- static int
++	if ((rc = append_strbuf_str(buff, "\t}\n")) < 0)
- snprint_hwentry (const struct config *conf,
++		return rc;
- 		 char * buff, int len, const struct hwentry * hwe)
++	return get_strbuf_len(buff) - initial_len;
-@@ -1575,6 +1608,17 @@ static int snprint_overrides(const struct config *conf, char * buff, int len,
++}
- 		if (fwd >= len)
- 			return len;
- 	}
 +
-+	if (overrides->pctable) {
++static int
++snprint_pctable (const struct config *conf, struct strbuf *buff,
++		 const struct _vector *pctable)
++{
++	int i, rc;
 +	struct pcentry *pce;
++	struct keyword * rootkw;
++	size_t initial_len = get_strbuf_len(buff);
 +
-+		vector_foreach_slot(overrides->pctable, pce, i) {
++	rootkw = find_keyword(conf->keywords, NULL, "overrides");
-+			fwd += snprint_pcentry(conf, buff + fwd, len - fwd,
++	assert(rootkw);
-+					       pce);
++
-+			if (fwd >= len)
++	vector_foreach_slot(pctable, pce, i) {
-+				return len;
++		if ((rc = snprint_pcentry(conf, buff, pce)) < 0)
++			return rc;
 +	}
++	return get_strbuf_len(buff) - initial_len;
 +}
++
+ static int
+ snprint_hwentry (const struct config *conf,
+ 		 struct strbuf *buff, const struct hwentry * hwe)
+@@ -1472,6 +1518,10 @@ static int snprint_overrides(const struct config *conf, struct strbuf *buff,
+ 		if ((rc = snprint_keyword(buff, "\t%k %v\n", kw, NULL)) < 0)
+ 			return rc;
+ 	}
++
++	if (overrides->pctable &&
++	    (rc = snprint_pctable(conf, buff, overrides->pctable)) < 0)
++		return rc;
  out:
- 	fwd += snprintf(buff + fwd, len - fwd, "}\n");
+ 	if ((rc = append_strbuf_str(buff, "}\n")) < 0)
- 	if (fwd >= len)
+ 		return rc;

SOURCES/0051-multipath.conf.5-Improve-checker_timeout-description.patch

@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Tue, 15 Dec 2020 12:47:14 -0600
-Subject: [PATCH] multipath.conf.5: Improve checker_timeout description
-
-I was asked to explain how checker_timeout works for checkers like
-directio, that don't issue scsi commands with an explicit timeout
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- multipath/multipath.conf.5 | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
-index 60954574..a5686090 100644
---- a/multipath/multipath.conf.5
-+++ b/multipath/multipath.conf.5
-@@ -634,8 +634,13 @@ The default is: \fBno\fR
- .
- .TP
- .B checker_timeout
--Specify the timeout to use for path checkers and prioritizers that issue SCSI
--commands with an explicit timeout, in seconds.
-+Specify the timeout to use for path checkers and prioritizers, in seconds.
-+Only prioritizers that issue scsi commands use checker_timeout. Checkers
-+that support an asynchronous mode (\fItur\fR and \fIdirectio\fR), will
-+return shortly after being called by multipathd, regardless of whether the
-+storage array responds. If the storage array hasn't responded, mulitpathd will
-+check for a response every second, until \fIchecker_timeout\fR seconds have
-+elapsed.
- .RS
- .TP
- The default is: in \fB/sys/block/sd<x>/device/timeout\fR
--- 
-2.17.2
-

SOURCES/0052-libmultipath-Set-the-scsi-timeout-parameters-by-path.patch

@@ -14,19 +14,19 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 Reviewed-by: Martin Wilck <mwilck@suse.com>
 ---
  libmultipath/configure.c |   5 +-
- libmultipath/discovery.c | 149 +++++++++++++++++++++++----------------
+ libmultipath/discovery.c | 158 ++++++++++++++++++++-------------------
  libmultipath/discovery.h |   2 +-
  libmultipath/propsel.c   |  42 +++++------
  libmultipath/propsel.h   |   6 +-
  libmultipath/structs.c   |   1 -
  libmultipath/structs.h   |   6 +-
- 7 files changed, 118 insertions(+), 93 deletions(-)
+ 7 files changed, 112 insertions(+), 108 deletions(-)
 
 diff --git a/libmultipath/configure.c b/libmultipath/configure.c
-index 9a9890f5..6cad0468 100644
+index 043e4232..70049f47 100644
 --- a/libmultipath/configure.c
 +++ b/libmultipath/configure.c
-@@ -338,9 +338,6 @@ int setup_map(struct multipath *mpp, char *params, int params_size,
+@@ -365,9 +365,6 @@ int setup_map(struct multipath *mpp, char **params, struct vectors *vecs)
  	select_mode(conf, mpp);
  	select_uid(conf, mpp);
  	select_gid(conf, mpp);
@@ -36,7 +36,7 @@ index 9a9890f5..6cad0468 100644
  	select_reservation_key(conf, mpp);
  	select_deferred_remove(conf, mpp);
  	select_marginal_path_err_sample_time(conf, mpp);
-@@ -356,7 +353,7 @@ int setup_map(struct multipath *mpp, char *params, int params_size,
+@@ -383,7 +380,7 @@ int setup_map(struct multipath *mpp, char **params, struct vectors *vecs)
  	select_ghost_delay(conf, mpp);
  	select_flush_on_last_del(conf, mpp);
  
@@ -46,10 +46,10 @@ index 9a9890f5..6cad0468 100644
  	pthread_cleanup_pop(1);
  
 diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
-index 2404cb87..36cc389e 100644
+index 6fb81c28..bcda8b09 100644
 --- a/libmultipath/discovery.c
 +++ b/libmultipath/discovery.c
-@@ -581,13 +581,13 @@ sysfs_get_asymmetric_access_state(struct path *pp, char *buff, int buflen)
+@@ -596,13 +596,13 @@ sysfs_get_asymmetric_access_state(struct path *pp, char *buff, int buflen)
  }
  
  static int
@@ -58,40 +58,41 @@ index 2404cb87..36cc389e 100644
  {
  	struct udev_device *hostdev;
  	char host_name[HOST_NAME_LEN], value[16];
- 	int ret;
+ 	int ret, len;
  
 -	if (mpp->eh_deadline == EH_DEADLINE_UNSET)
 +	if (pp->eh_deadline == EH_DEADLINE_UNSET)
  		return 0;
  
  	sprintf(host_name, "host%d", pp->sg_id.host_no);
-@@ -596,12 +596,12 @@ sysfs_set_eh_deadline(struct multipath *mpp, struct path *pp)
+@@ -611,12 +611,12 @@ sysfs_set_eh_deadline(struct multipath *mpp, struct path *pp)
  	if (!hostdev)
  		return 1;
  
 -	if (mpp->eh_deadline == EH_DEADLINE_OFF)
 +	if (pp->eh_deadline == EH_DEADLINE_OFF)
- 		sprintf(value, "off");
+ 		len = sprintf(value, "off");
 -	else if (mpp->eh_deadline == EH_DEADLINE_ZERO)
 +	else if (pp->eh_deadline == EH_DEADLINE_ZERO)
- 		sprintf(value, "0");
+ 		len = sprintf(value, "0");
  	else
--		snprintf(value, 16, "%u", mpp->eh_deadline);
+-		len = sprintf(value, "%d", mpp->eh_deadline);
-+		snprintf(value, 16, "%u", pp->eh_deadline);
++		len = sprintf(value, "%d", pp->eh_deadline);
  
  	ret = sysfs_attr_set_value(hostdev, "eh_deadline",
- 				   value, strlen(value));
+ 				   value, len + 1);
-@@ -625,6 +625,9 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
+@@ -640,8 +640,8 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
  	unsigned int tmo;
  	int ret;
  
-+	if (!pp->dev_loss && pp->fast_io_fail == MP_FAST_IO_FAIL_UNSET)
+-	if (mpp->dev_loss == DEV_LOSS_TMO_UNSET &&
-+		return;
+-	    mpp->fast_io_fail == MP_FAST_IO_FAIL_UNSET)
-+
++	if (pp->dev_loss == DEV_LOSS_TMO_UNSET &&
++	    pp->fast_io_fail == MP_FAST_IO_FAIL_UNSET)
+ 		return;
+ 
  	sprintf(rport_id, "rport-%d:%d-%d",
- 		pp->sg_id.host_no, pp->sg_id.channel, pp->sg_id.transport_id);
+@@ -683,14 +683,14 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
- 	rport_dev = udev_device_new_from_subsystem_sysname(udev,
-@@ -664,14 +667,14 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
  	 * then set fast_io_fail, and _then_ set dev_loss_tmo
  	 * to the correct value.
  	 */
@@ -111,7 +112,7 @@ index 2404cb87..36cc389e 100644
  			ret = sysfs_attr_set_value(rport_dev, "dev_loss_tmo",
  						   value, strlen(value));
  			if (ret <= 0) {
-@@ -685,20 +688,20 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
+@@ -704,20 +704,20 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
  				goto out;
  			}
  		}
@@ -119,7 +120,7 @@ index 2404cb87..36cc389e 100644
 -		mpp->no_path_retry != NO_PATH_RETRY_QUEUE) {
 +	} else if (pp->dev_loss > DEFAULT_DEV_LOSS_TMO &&
 +		   mpp->no_path_retry != NO_PATH_RETRY_QUEUE) {
- 		condlog(3, "%s: limiting dev_loss_tmo to %d, since "
+ 		condlog(2, "%s: limiting dev_loss_tmo to %d, since "
  			"fast_io_fail is not set",
  			rport_id, DEFAULT_DEV_LOSS_TMO);
 -		mpp->dev_loss = DEFAULT_DEV_LOSS_TMO;
@@ -139,18 +140,18 @@ index 2404cb87..36cc389e 100644
  		ret = sysfs_attr_set_value(rport_dev, "fast_io_fail_tmo",
  					   value, strlen(value));
  		if (ret <= 0) {
-@@ -709,8 +712,8 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
+@@ -728,8 +728,8 @@ sysfs_set_rport_tmo(struct multipath *mpp, struct path *pp)
  					rport_id, value, -ret);
  		}
  	}
--	if (mpp->dev_loss > 0) {
+-	if (mpp->dev_loss != DEV_LOSS_TMO_UNSET) {
 -		snprintf(value, 16, "%u", mpp->dev_loss);
-+	if (pp->dev_loss > 0) {
++	if (pp->dev_loss != DEV_LOSS_TMO_UNSET) {
 +		snprintf(value, 16, "%u", pp->dev_loss);
  		ret = sysfs_attr_set_value(rport_dev, "dev_loss_tmo",
  					   value, strlen(value));
  		if (ret <= 0) {
-@@ -726,7 +729,7 @@ out:
+@@ -745,15 +745,15 @@ out:
  }
  
  static void
@@ -159,14 +160,20 @@ index 2404cb87..36cc389e 100644
  {
  	struct udev_device *session_dev = NULL;
  	char session_id[64];
-@@ -743,18 +746,18 @@ sysfs_set_session_tmo(struct multipath *mpp, struct path *pp)
+ 	char value[11];
+ 
+-	if (mpp->dev_loss != DEV_LOSS_TMO_UNSET)
++	if (pp->dev_loss != DEV_LOSS_TMO_UNSET)
+ 		condlog(3, "%s: ignoring dev_loss_tmo on iSCSI", pp->dev);
+-	if (mpp->fast_io_fail == MP_FAST_IO_FAIL_UNSET)
++	if (pp->fast_io_fail == MP_FAST_IO_FAIL_UNSET)
+ 		return;
+ 
+ 	sprintf(session_id, "session%d", pp->sg_id.transport_id);
+@@ -767,15 +767,15 @@ sysfs_set_session_tmo(struct multipath *mpp, struct path *pp)
  	condlog(4, "target%d:%d:%d -> %s", pp->sg_id.host_no,
  		pp->sg_id.channel, pp->sg_id.scsi_id, session_id);
  
--	if (mpp->dev_loss) {
-+	if (pp->dev_loss) {
- 		condlog(3, "%s: ignoring dev_loss_tmo on iSCSI", pp->dev);
- 	}
 -	if (mpp->fast_io_fail != MP_FAST_IO_FAIL_UNSET) {
 -		if (mpp->fast_io_fail == MP_FAST_IO_FAIL_OFF) {
 +	if (pp->fast_io_fail != MP_FAST_IO_FAIL_UNSET) {
@@ -183,35 +190,35 @@ index 2404cb87..36cc389e 100644
  			if (sysfs_attr_set_value(session_dev, "recovery_tmo",
  						 value, strlen(value)) <= 0) {
  				condlog(3, "%s: Failed to set recovery_tmo, "
-@@ -767,12 +770,15 @@ sysfs_set_session_tmo(struct multipath *mpp, struct path *pp)
+@@ -788,14 +788,14 @@ sysfs_set_session_tmo(struct multipath *mpp, struct path *pp)
  }
  
  static void
 -sysfs_set_nexus_loss_tmo(struct multipath *mpp, struct path *pp)
 +sysfs_set_nexus_loss_tmo(struct path *pp)
  {
- 	struct udev_device *sas_dev = NULL;
+ 	struct udev_device *parent, *sas_dev = NULL;
- 	char end_dev_id[64];
+ 	const char *end_dev_id = NULL;
  	char value[11];
+ 	static const char ed_str[] = "end_device-";
  
-+	if (!pp->udev || !pp->dev_loss)
+-	if (!pp->udev || mpp->dev_loss == DEV_LOSS_TMO_UNSET)
-+		return;
++	if (!pp->udev || pp->dev_loss == DEV_LOSS_TMO_UNSET)
-+
+ 		return;
- 	sprintf(end_dev_id, "end_device-%d:%d",
+ 
- 		pp->sg_id.host_no, pp->sg_id.transport_id);
+ 	for (parent = udev_device_get_parent(pp->udev);
- 	sas_dev = udev_device_new_from_subsystem_sysname(udev,
+@@ -822,8 +822,8 @@ sysfs_set_nexus_loss_tmo(struct multipath *mpp, struct path *pp)
-@@ -785,8 +791,8 @@ sysfs_set_nexus_loss_tmo(struct multipath *mpp, struct path *pp)
  	condlog(4, "target%d:%d:%d -> %s", pp->sg_id.host_no,
  		pp->sg_id.channel, pp->sg_id.scsi_id, end_dev_id);
  
--	if (mpp->dev_loss) {
+-	if (mpp->dev_loss != DEV_LOSS_TMO_UNSET) {
 -		snprintf(value, 11, "%u", mpp->dev_loss);
-+	if (pp->dev_loss) {
++	if (pp->dev_loss != DEV_LOSS_TMO_UNSET) {
 +		snprintf(value, 11, "%u", pp->dev_loss);
  		if (sysfs_attr_set_value(sas_dev, "I_T_nexus_loss_timeout",
  					 value, strlen(value)) <= 0)
  			condlog(3, "%s: failed to update "
-@@ -798,53 +804,76 @@ sysfs_set_nexus_loss_tmo(struct multipath *mpp, struct path *pp)
+@@ -835,47 +835,59 @@ sysfs_set_nexus_loss_tmo(struct multipath *mpp, struct path *pp)
  }
  
  int
@@ -221,6 +228,7 @@ index 2404cb87..36cc389e 100644
  	struct path *pp;
  	int i;
 -	unsigned int dev_loss_tmo = mpp->dev_loss;
+-	struct path *err_path = NULL;
 +	unsigned int min_dev_loss = 0;
 +	bool warn_dev_loss = false;
 +	bool warn_fast_io_fail = false;
@@ -234,21 +242,24 @@ index 2404cb87..36cc389e 100644
 -			no_path_retry_tmo = MAX_DEV_LOSS_TMO;
 -		if (no_path_retry_tmo > dev_loss_tmo)
 -			dev_loss_tmo = no_path_retry_tmo;
--		condlog(3, "%s: update dev_loss_tmo to %u",
--			mpp->alias, dev_loss_tmo);
 -	} else if (mpp->no_path_retry == NO_PATH_RETRY_QUEUE) {
 -		dev_loss_tmo = MAX_DEV_LOSS_TMO;
--		condlog(3, "%s: update dev_loss_tmo to %u",
--			mpp->alias, dev_loss_tmo);
 -	}
+-	if (mpp->dev_loss != DEV_LOSS_TMO_UNSET &&
+-	    mpp->dev_loss != dev_loss_tmo) {
+-		condlog(2, "%s: Using dev_loss_tmo=%u instead of %u because of no_path_retry setting",
+-			mpp->alias, dev_loss_tmo, mpp->dev_loss);
 -		mpp->dev_loss = dev_loss_tmo;
--	if (mpp->dev_loss && mpp->fast_io_fail > 0 &&
+-	}
+-	if (mpp->dev_loss != DEV_LOSS_TMO_UNSET &&
+-	    mpp->fast_io_fail != MP_FAST_IO_FAIL_UNSET &&
 -	    (unsigned int)mpp->fast_io_fail >= mpp->dev_loss) {
 -		condlog(3, "%s: turning off fast_io_fail (%d is not smaller than dev_loss_tmo)",
 -			mpp->alias, mpp->fast_io_fail);
 -		mpp->fast_io_fail = MP_FAST_IO_FAIL_OFF;
 -	}
--	if (!mpp->dev_loss && mpp->fast_io_fail == MP_FAST_IO_FAIL_UNSET &&
+-	if (mpp->dev_loss == DEV_LOSS_TMO_UNSET &&
+-	    mpp->fast_io_fail == MP_FAST_IO_FAIL_UNSET &&
 -	    mpp->eh_deadline == EH_DEADLINE_UNSET)
 -		return 0;
 +			min_dev_loss = MAX_DEV_LOSS_TMO;
@@ -258,58 +269,70 @@ index 2404cb87..36cc389e 100644
 +		min_dev_loss = MAX_DEV_LOSS_TMO;
  
  	vector_foreach_slot(mpp->paths, pp, i) {
+-		if (pp->bus != SYSFS_BUS_SCSI) {
+-			if (!err_path)
+-				err_path = pp;
 +		select_fast_io_fail(conf, pp);
 +		select_dev_loss(conf, pp);
 +		select_eh_deadline(conf, pp);
 +
-+		if (!pp->dev_loss && pp->eh_deadline == EH_DEADLINE_UNSET &&
++		if (pp->dev_loss == DEV_LOSS_TMO_UNSET &&
-+		    pp->fast_io_fail == MP_FAST_IO_FAIL_UNSET)
++		    pp->fast_io_fail == MP_FAST_IO_FAIL_UNSET &&
++		    pp->eh_deadline == EH_DEADLINE_UNSET)
++			continue;
++
++		if (pp->bus != SYSFS_BUS_SCSI)
 +			continue;
 +
- 		if (pp->bus != SYSFS_BUS_SCSI)
- 			continue;
 +		sysfs_set_eh_deadline(pp);
 +
-+		if (!pp->dev_loss && pp->fast_io_fail == MP_FAST_IO_FAIL_UNSET)
++		if (pp->dev_loss == DEV_LOSS_TMO_UNSET &&
-+			continue;
++		    pp->fast_io_fail == MP_FAST_IO_FAIL_UNSET)
+ 			continue;
 +
 +		if (pp->sg_id.proto_id != SCSI_PROTOCOL_FCP &&
 +		    pp->sg_id.proto_id != SCSI_PROTOCOL_ISCSI &&
 +		    pp->sg_id.proto_id != SCSI_PROTOCOL_SAS)
 +			continue;
 +
-+		if (pp->dev_loss > 0 && pp->dev_loss < min_dev_loss) {
++		if (pp->dev_loss != DEV_LOSS_TMO_UNSET &&
++		    pp->dev_loss < min_dev_loss) {
 +			warn_dev_loss = true;
 +			pp->dev_loss = min_dev_loss;
 +		}
-+		if (pp->dev_loss > 0 && pp->fast_io_fail > 0 &&
++		if (pp->dev_loss != DEV_LOSS_TMO_UNSET &&
++		    pp->fast_io_fail > 0 &&
 +		    (unsigned int)pp->fast_io_fail >= pp->dev_loss) {
 +			warn_fast_io_fail = true;
 +			pp->fast_io_fail = MP_FAST_IO_FAIL_OFF;
-+		}
+ 		}
  
--		if (mpp->dev_loss ||
+ 		switch (pp->sg_id.proto_id) {
--		    mpp->fast_io_fail != MP_FAST_IO_FAIL_UNSET) {
+@@ -883,25 +895,21 @@ sysfs_set_scsi_tmo (struct multipath *mpp, unsigned int checkint)
--			if (pp->sg_id.proto_id == SCSI_PROTOCOL_FCP)
+ 			sysfs_set_rport_tmo(mpp, pp);
--				sysfs_set_rport_tmo(mpp, pp);
+ 			break;
--			else if (pp->sg_id.proto_id == SCSI_PROTOCOL_ISCSI)
+ 		case SCSI_PROTOCOL_ISCSI:
 -			sysfs_set_session_tmo(mpp, pp);
--			else if (pp->sg_id.proto_id == SCSI_PROTOCOL_SAS)
--				sysfs_set_nexus_loss_tmo(mpp, pp);
-+		switch (pp->sg_id.proto_id) {
-+		case SCSI_PROTOCOL_FCP:
-+			sysfs_set_rport_tmo(mpp, pp);
-+			break;
-+		case SCSI_PROTOCOL_ISCSI:
 +			sysfs_set_session_tmo(pp);
-+			break;
+ 			break;
-+		case SCSI_PROTOCOL_SAS:
+ 		case SCSI_PROTOCOL_SAS:
+-			sysfs_set_nexus_loss_tmo(mpp, pp);
 +			sysfs_set_nexus_loss_tmo(pp);
-+			break;
+ 			break;
-+		default:
+ 		default:
+-			if (!err_path)
+-				err_path = pp;
 +			break;
  		}
 -		sysfs_set_eh_deadline(mpp, pp);
+-	}
+-
+-	if (err_path) {
+-		STRBUF_ON_STACK(proto_buf);
+-
+-		snprint_path_protocol(&proto_buf, err_path);
+-		condlog(2, "%s: setting dev_loss_tmo is unsupported for protocol %s",
+-			mpp->alias, get_strbuf_str(&proto_buf));
  	}
 +	if (warn_dev_loss)
 +		condlog(2, "%s: Raising dev_loss_tmo to %u because of no_path_retry setting",
@@ -334,10 +357,10 @@ index a5446b4d..b6eea258 100644
  int sysfs_get_host_pci_name(const struct path *pp, char *pci_name);
  int sysfs_get_iscsi_ip_address(const struct path *pp, char *ip_address);
 diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
-index 127b3370..25326eb6 100644
+index 677ab9e1..f146fe64 100644
 --- a/libmultipath/propsel.c
 +++ b/libmultipath/propsel.c
-@@ -766,51 +766,51 @@ int select_minio(struct config *conf, struct multipath *mp)
+@@ -770,53 +770,53 @@ int select_minio(struct config *conf, struct multipath *mp)
  		return select_minio_bio(conf, mp);
  }
  
@@ -345,7 +368,7 @@ index 127b3370..25326eb6 100644
 +int select_fast_io_fail(struct config *conf, struct path *pp)
  {
  	const char *origin;
- 	char buff[12];
+ 	STRBUF_ON_STACK(buff);
  
 -	mp_set_ovr(fast_io_fail);
 -	mp_set_hwe(fast_io_fail);
@@ -356,10 +379,11 @@ index 127b3370..25326eb6 100644
 +	pp_set_conf(fast_io_fail);
 +	pp_set_default(fast_io_fail, DEFAULT_FAST_IO_FAIL);
  out:
--	print_undef_off_zero(buff, 12, mp->fast_io_fail);
+-	print_undef_off_zero(&buff, mp->fast_io_fail);
--	condlog(3, "%s: fast_io_fail_tmo = %s %s", mp->alias, buff, origin);
+-	condlog(3, "%s: fast_io_fail_tmo = %s %s", mp->alias,
-+	print_undef_off_zero(buff, 12, pp->fast_io_fail);
++	print_undef_off_zero(&buff, pp->fast_io_fail);
-+	condlog(3, "%s: fast_io_fail_tmo = %s %s", pp->dev, buff, origin);
++	condlog(3, "%s: fast_io_fail_tmo = %s %s", pp->dev,
+ 		get_strbuf_str(&buff), origin);
  	return 0;
  }
  
@@ -367,22 +391,23 @@ index 127b3370..25326eb6 100644
 +int select_dev_loss(struct config *conf, struct path *pp)
  {
  	const char *origin;
- 	char buff[12];
+ 	STRBUF_ON_STACK(buff);
  
 -	mp_set_ovr(dev_loss);
 -	mp_set_hwe(dev_loss);
 -	mp_set_conf(dev_loss);
--	mp->dev_loss = 0;
+-	mp->dev_loss = DEV_LOSS_TMO_UNSET;
 +	pp_set_ovr(dev_loss);
 +	pp_set_hwe(dev_loss);
 +	pp_set_conf(dev_loss);
-+	pp->dev_loss = 0;
++	pp->dev_loss = DEV_LOSS_TMO_UNSET;
  	return 0;
  out:
--	print_dev_loss(buff, 12, mp->dev_loss);
+-	print_dev_loss(&buff, mp->dev_loss);
--	condlog(3, "%s: dev_loss_tmo = %s %s", mp->alias, buff, origin);
+-	condlog(3, "%s: dev_loss_tmo = %s %s", mp->alias,
-+	print_dev_loss(buff, 12, pp->dev_loss);
++	print_dev_loss(&buff, pp->dev_loss);
-+	condlog(3, "%s: dev_loss_tmo = %s %s", pp->dev, buff, origin);
++	condlog(3, "%s: dev_loss_tmo = %s %s", pp->dev,
+ 		get_strbuf_str(&buff), origin);
  	return 0;
  }
  
@@ -390,7 +415,7 @@ index 127b3370..25326eb6 100644
 +int select_eh_deadline(struct config *conf, struct path *pp)
  {
  	const char *origin;
- 	char buff[12];
+ 	STRBUF_ON_STACK(buff);
  
 -	mp_set_ovr(eh_deadline);
 -	mp_set_hwe(eh_deadline);
@@ -403,13 +428,13 @@ index 127b3370..25326eb6 100644
  	/* not changing sysfs in default cause, so don't print anything */
  	return 0;
  out:
--	print_undef_off_zero(buff, 12, mp->eh_deadline);
+-	print_undef_off_zero(&buff, mp->eh_deadline);
--	condlog(3, "%s: eh_deadline = %s %s", mp->alias, buff, origin);
+-	condlog(3, "%s: eh_deadline = %s %s", mp->alias,
-+	print_undef_off_zero(buff, 12, pp->eh_deadline);
++	print_undef_off_zero(&buff, pp->eh_deadline);
-+	condlog(3, "%s: eh_deadline = %s %s", pp->dev, buff, origin);
++	condlog(3, "%s: eh_deadline = %s %s", pp->dev,
+ 		get_strbuf_str(&buff), origin);
  	return 0;
  }
- 
 diff --git a/libmultipath/propsel.h b/libmultipath/propsel.h
 index 72a7e33c..152ca44c 100644
 --- a/libmultipath/propsel.h
@@ -428,10 +453,10 @@ index 72a7e33c..152ca44c 100644
  int select_retain_hwhandler (struct config *conf, struct multipath * mp);
  int select_detect_prio(struct config *conf, struct path * pp);
 diff --git a/libmultipath/structs.c b/libmultipath/structs.c
-index 19099bed..9f86eb69 100644
+index d20e1eea..acd4cbeb 100644
 --- a/libmultipath/structs.c
 +++ b/libmultipath/structs.c
-@@ -230,7 +230,6 @@ alloc_multipath (void)
+@@ -246,7 +246,6 @@ alloc_multipath (void)
  		mpp->bestpg = 1;
  		mpp->mpcontext = NULL;
  		mpp->no_path_retry = NO_PATH_RETRY_UNDEF;
@@ -440,10 +465,10 @@ index 19099bed..9f86eb69 100644
  	}
  	return mpp;
 diff --git a/libmultipath/structs.h b/libmultipath/structs.h
-index ab99852f..875e726e 100644
+index 618ff4fb..8a07d470 100644
 --- a/libmultipath/structs.h
 +++ b/libmultipath/structs.h
-@@ -344,6 +344,9 @@ struct path {
+@@ -340,6 +340,9 @@ struct path {
  	int marginal;
  	int vpd_vendor_id;
  	int recheck_wwid;
@@ -453,7 +478,7 @@ index ab99852f..875e726e 100644
  	/* configlet pointers */
  	vector hwe;
  	struct gen_path generic_path;
-@@ -371,7 +374,6 @@ struct multipath {
+@@ -367,7 +370,6 @@ struct multipath {
  	int minio;
  	int flush_on_last_del;
  	int attribute_flags;
@@ -461,7 +486,7 @@ index ab99852f..875e726e 100644
  	int retain_hwhandler;
  	int deferred_remove;
  	bool in_recovery;
-@@ -389,8 +391,6 @@ struct multipath {
+@@ -385,8 +387,6 @@ struct multipath {
  	int needs_paths_uevent;
  	int ghost_delay;
  	int ghost_delay_tick;

SOURCES/0052-libmultipath-check-for-null-wwid-before-strcmp.patch

@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Mon, 4 Jan 2021 21:59:54 -0600
-Subject: [PATCH] libmultipath: check for null wwid before strcmp
-
-Commit 749aabd0 (libmultipath: ignore multipaths sections without wwid
-option) removed all mpentries with a NULL wwid, but didn't stop strcmp()
-from being run on them in merge_mptable(). The result of strcmp() with
-a NULL parameter is undefined, so fix that.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
-
-Reviewed-by: Martin Wilck <mwilck@suse.com>
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/config.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libmultipath/config.c b/libmultipath/config.c
-index dc81c994..dd645f17 100644
---- a/libmultipath/config.c
-+++ b/libmultipath/config.c
-@@ -453,7 +453,7 @@ void merge_mptable(vector mptable)
- 		}
- 		j = i + 1;
- 		vector_foreach_slot_after(mptable, mp2, j) {
--			if (strcmp(mp1->wwid, mp2->wwid))
-+			if (!mp2->wwid || strcmp(mp1->wwid, mp2->wwid))
- 				continue;
- 			condlog(1, "%s: duplicate multipath config section for %s",
- 				__func__, mp1->wwid);
--- 
-2.17.2
-

SOURCES/0053-libmultipath-check-the-overrides-pctable-for-path-va.patch

@@ -15,10 +15,10 @@ Reviewed-by: Martin Wilck <mwilck@suse.com>
  1 file changed, 26 insertions(+), 3 deletions(-)
 
 diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
-index 25326eb6..209c1d67 100644
+index f146fe64..2b47f5f8 100644
 --- a/libmultipath/propsel.c
 +++ b/libmultipath/propsel.c
-@@ -79,6 +79,8 @@ static const char conf_origin[] =
+@@ -80,6 +80,8 @@ static const char conf_origin[] =
  	"(setting: multipath.conf defaults/devices section)";
  static const char overrides_origin[] =
  	"(setting: multipath.conf overrides section)";
@@ -27,7 +27,7 @@ index 25326eb6..209c1d67 100644
  static const char cmdline_origin[] =
  	"(setting: multipath command line [-p] flag)";
  static const char autodetect_origin[] =
-@@ -144,6 +146,27 @@ do {									\
+@@ -147,6 +149,27 @@ do {									\
  	}								\
  } while (0)
  
@@ -55,27 +55,27 @@ index 25326eb6..209c1d67 100644
  int select_mode(struct config *conf, struct multipath *mp)
  {
  	const char *origin;
-@@ -771,7 +794,7 @@ int select_fast_io_fail(struct config *conf, struct path *pp)
+@@ -775,7 +798,7 @@ int select_fast_io_fail(struct config *conf, struct path *pp)
  	const char *origin;
- 	char buff[12];
+ 	STRBUF_ON_STACK(buff);
  
 -	pp_set_ovr(fast_io_fail);
 +	pp_set_ovr_pce(fast_io_fail);
  	pp_set_hwe(fast_io_fail);
  	pp_set_conf(fast_io_fail);
  	pp_set_default(fast_io_fail, DEFAULT_FAST_IO_FAIL);
-@@ -786,7 +809,7 @@ int select_dev_loss(struct config *conf, struct path *pp)
+@@ -791,7 +814,7 @@ int select_dev_loss(struct config *conf, struct path *pp)
  	const char *origin;
- 	char buff[12];
+ 	STRBUF_ON_STACK(buff);
  
 -	pp_set_ovr(dev_loss);
 +	pp_set_ovr_pce(dev_loss);
  	pp_set_hwe(dev_loss);
  	pp_set_conf(dev_loss);
- 	pp->dev_loss = 0;
+ 	pp->dev_loss = DEV_LOSS_TMO_UNSET;
-@@ -802,7 +825,7 @@ int select_eh_deadline(struct config *conf, struct path *pp)
+@@ -808,7 +831,7 @@ int select_eh_deadline(struct config *conf, struct path *pp)
  	const char *origin;
- 	char buff[12];
+ 	STRBUF_ON_STACK(buff);
  
 -	pp_set_ovr(eh_deadline);
 +	pp_set_ovr_pce(eh_deadline);

SOURCES/0053-libmultipath-make-find_err_path_by_dev-static.patch

@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Thu, 14 Jan 2021 20:20:22 -0600
-Subject: [PATCH] libmultipath: make find_err_path_by_dev() static
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
-Reviewed-by: Martin Wilck <mwilck@suse.com>
----
- libmultipath/io_err_stat.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libmultipath/io_err_stat.c b/libmultipath/io_err_stat.c
-index 1b9cd6c0..449760a0 100644
---- a/libmultipath/io_err_stat.c
-+++ b/libmultipath/io_err_stat.c
-@@ -89,7 +89,7 @@ static void rcu_unregister(__attribute__((unused)) void *param)
- 	rcu_unregister_thread();
- }
- 
--struct io_err_stat_path *find_err_path_by_dev(vector pathvec, char *dev)
-+static struct io_err_stat_path *find_err_path_by_dev(vector pathvec, char *dev)
- {
- 	int i;
- 	struct io_err_stat_path *pp;
--- 
-2.17.2
-