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

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