996407fc5f
Update Source to latest upstream commit Rename files * Previous patches 0001-0020 are now patches 0002-0021 * Previous patches 0021-0028 are now patches 0026-0033 Add 0001-kpartx-Use-absolute-paths-to-create-mappings.patch Add 0022-multipathd-check-for-NULL-udevice-in-cli_add_path.patch Add 0023-libmultipath-remove-max_fds-code-duplication.patch Add 0024-multipathd-set-return-code-for-multipathd-commands.patch Add 0025-mpathpersist-fix-registration-rollback-issue.patch * The above 5 patches have been submitted upstream
40 lines
1.7 KiB
Diff
40 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Mon, 8 Oct 2018 16:45:11 -0500
|
|
Subject: [PATCH] mpathpersist: fix registration rollback issue
|
|
|
|
When mpathpersist tries to rollback the registration, it copies
|
|
the SARK to the RK, and clears the SARK. However, it repeated this step
|
|
for each thread. This means that the first rollback thread correctly
|
|
had the RK set to the SARK used during registration. However, if more
|
|
than one registration needed to be rolled back, later threads would have
|
|
both the RK and SARK cleared. This commit fixes that by only copying and
|
|
clearing the SARK once.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmpathpersist/mpath_persist.c | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/libmpathpersist/mpath_persist.c b/libmpathpersist/mpath_persist.c
|
|
index 29e7fb4..2ffe56e 100644
|
|
--- a/libmpathpersist/mpath_persist.c
|
|
+++ b/libmpathpersist/mpath_persist.c
|
|
@@ -559,11 +559,10 @@ int mpath_prout_reg(struct multipath *mpp,int rq_servact, int rq_scope,
|
|
}
|
|
if (rollback && ((rq_servact == MPATH_PROUT_REG_SA) && sa_key != 0 )){
|
|
condlog (3, "%s: ERROR: initiating pr out rollback", mpp->wwid);
|
|
+ memcpy(¶mp->key, ¶mp->sa_key, 8);
|
|
+ memset(¶mp->sa_key, 0, 8);
|
|
for( i=0 ; i < count ; i++){
|
|
if(thread[i].param.status == MPATH_PR_SUCCESS) {
|
|
- memcpy(&thread[i].param.paramp->key, &thread[i].param.paramp->sa_key, 8);
|
|
- memset(&thread[i].param.paramp->sa_key, 0, 8);
|
|
- thread[i].param.status = MPATH_PR_SUCCESS;
|
|
rc = pthread_create(&thread[i].id, &attr, mpath_prout_pthread_fn,
|
|
(void *)(&thread[i].param));
|
|
if (rc){
|
|
--
|
|
2.7.4
|
|
|