Merge pull request #2544 from ggouaillardet/topic/mca_spml_yoda_get

ggouaillardet · web-flow · commit 804a784fce06 · 2016-12-08T17:26:07.000+09:00
spml/yoda: fix support for BTLs that do not register memory in mca_sp…
diff --git a/oshmem/mca/spml/yoda/spml_yoda.c b/oshmem/mca/spml/yoda/spml_yoda.c
@@ -1166,6 +1166,9 @@ int mca_spml_yoda_get(void* src_addr, size_t size, void* dst_addr, int src)
                 }
 
                 frag->local_handle = local_handle;
+            } else if (NULL == l_mkey) {
+                local_handle = NULL;
+                frag->local_handle = NULL;
             } else {
                 local_handle = ((mca_spml_yoda_context_t*)l_mkey->spml_context)->registration;
                 frag->local_handle = NULL;

Original file line number	Diff line number	Diff line change
`@@ -1166,6 +1166,9 @@ int mca_spml_yoda_get(void* src_addr, size_t size, void* dst_addr, int src)`
`1166`	`1166`	`}`
`1167`	`1167`
`1168`	`1168`	`frag->local_handle = local_handle;`
	`1169`	`+ } else if (NULL == l_mkey) {`
	`1170`	`+ local_handle = NULL;`
	`1171`	`+ frag->local_handle = NULL;`
`1169`	`1172`	`} else {`
`1170`	`1173`	`local_handle = ((mca_spml_yoda_context_t*)l_mkey->spml_context)->registration;`
`1171`	`1174`	`frag->local_handle = NULL;`