complex: Fix check for local MR mode and also pass correct access flags

Signed-off-by: Arun C Ilango <arun.ilango@intel.com> (cherry picked from commit bd9dc8f)
ofiwg · Dec 18, 2017 · 749f5f2 · 749f5f2
1 parent e944ac0
commit 749f5f2
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/complex/ft_domain.c b/complex/ft_domain.c
@@ -191,8 +191,9 @@ static int ft_setup_xcontrol_bufs(struct ft_xcontrol *ctrl)
 		memset(ctrl->buf, 0, size);
 	}
 
-	if ((fabric_info->mode & FI_LOCAL_MR) && !ctrl->mr) {
-		ret = fi_mr_reg(domain, ctrl->buf, size, FI_RECV | FI_SEND,
+	if ((fabric_info->domain_attr->mr_mode & FI_MR_LOCAL) && !ctrl->mr) {
+		ret = fi_mr_reg(domain, ctrl->buf, size,
+				ft_info_to_mr_access(fabric_info),
 				0, 0, 0, &ctrl->mr, NULL);
 		if (ret) {
 			FT_PRINTERR("fi_mr_reg", ret);
@@ -238,7 +239,7 @@ static int ft_setup_atomic_control(struct ft_atomic_control *ctrl)
 		memset(ctrl->orig_buf, 0, size);
 	}
 
-	if (fabric_info->mode & FI_LOCAL_MR) {
+	if (fabric_info->domain_attr->mr_mode & FI_MR_LOCAL) {
 		access = FI_READ | FI_WRITE | FI_REMOTE_READ | FI_REMOTE_WRITE;
 		if (!ctrl->res_mr) {
 			ret = fi_mr_reg(domain, ctrl->res_buf, size, access,