34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
|
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
|
||
|
|
|