rma: fix locking/unlocking of MPI_PROC_NULL

It is valid to lock/unlock MPI_PROC_NULL. It probably isn't work tracking
whether MPI_PROC_NULL is locked for MPI_PROC_NULL RMA operations so this
is probably the permanent solution.

Closes trac:4720

Tracking the 1.8.2 issue with this CMR.

cmr=v1.8.2:reviewer=bbenton

This commit was SVN r32011.

The following Trac tickets were found above:
  Ticket 4720 --> https://svn.open-mpi.org/trac/ompi/ticket/4720

ompi/mpi/c/win_lock.c

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -9,6 +10,8 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2014      Los Alamos National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -57,6 +60,9 @@ 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;
+
     OPAL_CR_ENTER_LIBRARY();
 
     rc = win->w_osc_module->osc_lock(lock_type, rank, assert, win);

ompi/mpi/c/win_unlock.c

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -9,6 +10,8 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2014      Los Alamos National Security, LLC.  All rights
+ *                         reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -50,6 +53,9 @@ 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;
+
     OPAL_CR_ENTER_LIBRARY();
 
     rc = win->w_osc_module->osc_unlock(rank, win);