|
 |
497756 |
From 0e3df6e32ba46fda98979e2e4fb1997d17f04b6e Mon Sep 17 00:00:00 2001
|
|
|
497756 |
From: Honggang Li <honli@redhat.com>
|
|
|
497756 |
Date: Thu, 4 Jul 2019 03:40:09 -0400
|
|
|
497756 |
Subject: [PATCH 1/2] Revert "prov/psm2: Fix scalalble endpoint handling in
|
|
|
497756 |
fi_av_remove()"
|
|
|
497756 |
|
|
|
497756 |
This reverts commit 2bb4bcba5a78db20bfc3f3505763e1a3b03dd353.
|
|
|
497756 |
---
|
|
|
497756 |
prov/psm2/src/psmx2_av.c | 7 ++-----
|
|
|
497756 |
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
497756 |
|
|
|
497756 |
diff --git a/prov/psm2/src/psmx2_av.c b/prov/psm2/src/psmx2_av.c
|
|
|
497756 |
index bb4fd615c..2dabf93bb 100644
|
|
|
497756 |
--- a/prov/psm2/src/psmx2_av.c
|
|
|
497756 |
+++ b/prov/psm2/src/psmx2_av.c
|
|
|
497756 |
@@ -678,19 +678,16 @@ STATIC int psmx2_av_remove(struct fid_av *av, fi_addr_t *fi_addr, size_t count,
|
|
|
497756 |
av_priv->conn_info[j].epaddrs[idx] = NULL;
|
|
|
497756 |
}
|
|
|
497756 |
} else {
|
|
|
497756 |
- if (!av_priv->sep_info[idx].epids)
|
|
|
497756 |
- continue;
|
|
|
497756 |
-
|
|
|
497756 |
for (j = 0; j < av_priv->max_trx_ctxt; j++) {
|
|
|
497756 |
if (!av_priv->conn_info[j].trx_ctxt)
|
|
|
497756 |
continue;
|
|
|
497756 |
|
|
|
497756 |
- if (!av_priv->conn_info[j].sepaddrs[idx])
|
|
|
497756 |
+ if (!av_priv->conn_info[j].sepaddrs)
|
|
|
497756 |
continue;
|
|
|
497756 |
|
|
|
497756 |
for (k = 0; k < av_priv->sep_info[idx].ctxt_cnt; k++) {
|
|
|
497756 |
err = psmx2_av_disconnect_addr(
|
|
|
497756 |
- j, av_priv->sep_info[idx].epids[k],
|
|
|
497756 |
+ j, av_priv->table[idx].epid,
|
|
|
497756 |
av_priv->conn_info[j].sepaddrs[idx][k]);
|
|
|
497756 |
if (!err)
|
|
|
497756 |
av_priv->conn_info[j].sepaddrs[idx][k] = NULL;
|
|
|
497756 |
--
|
|
|
497756 |
2.20.1
|
|
|
497756 |
|