mpi/c: MPI_PROC_NULL is not a valid rank in MPI_Win_{lock,unlock}

Signed-off-by: Gilles Gouaillardet <[email protected]>

(back-ported from commit ebe6125)

Author: ggouaillardet

ompi/mpi/c/win_lock.c

@@ -12,7 +12,7 @@
  *                         All rights reserved.
  * Copyright (c) 2014      Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -61,9 +61,6 @@ int MPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win)
         }
     }
 
-    /* NTH: do not bother keeping track of locking MPI_PROC_NULL. */
-    if (MPI_PROC_NULL == rank) return MPI_SUCCESS;
-
     rc = win->w_osc_module->osc_lock(lock_type, rank, assert, win);
     OMPI_ERRHANDLER_RETURN(rc, win, rc, FUNC_NAME);
 }

ompi/mpi/c/win_unlock.c

@@ -12,7 +12,7 @@
  *                         All rights reserved.
  * Copyright (c) 2014      Los Alamos National Security, LLC.  All rights
  *                         reserved.
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -54,9 +54,6 @@ int MPI_Win_unlock(int rank, MPI_Win win)
         }
     }
 
-    /* NTH: do not bother keeping track of unlocking MPI_PROC_NULL. */
-    if (MPI_PROC_NULL == rank) return MPI_SUCCESS;
-
     rc = win->w_osc_module->osc_unlock(rank, win);
     OMPI_ERRHANDLER_RETURN(rc, win, rc, FUNC_NAME);
 }