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