[Ocfs2-commits] khackel commits r2342 - trunk/fs/ocfs2/dlm

[svn-commits at oss.oracle.com]

Author: khackel
Signed-off-by: mfasheh
Date: 2005-05-31 18:49:26 -0500 (Tue, 31 May 2005)
New Revision: 2342

Modified:
   trunk/fs/ocfs2/dlm/dlmmaster.c
Log:
* fixes bug 465.  allows the lockres owner to re-assert ownership after the
  initial assertion.  this happens in some cases in normal operation, but
  can also be used as a debugging aid later on.

Signed-off-by: mfasheh



Modified: trunk/fs/ocfs2/dlm/dlmmaster.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmmaster.c	2005-05-30 21:37:47 UTC (rev 2341)
+++ trunk/fs/ocfs2/dlm/dlmmaster.c	2005-05-31 23:49:26 UTC (rev 2342)
@@ -1247,6 +1247,13 @@
 			}
 		} else if (mle->type != DLM_MLE_MIGRATION) {
 			if (res->owner != DLM_LOCK_RES_OWNER_UNKNOWN) {
+				/* owner is just re-asserting */
+				if (res->owner == assert->node_idx) {
+					mlog(0, "owner %u re-asserting on "
+					     "lock %.*s\n", assert->node_idx,
+					     namelen, name);
+					goto ok;
+				}
 				mlog(ML_ERROR, "got assert_master from "
 				     "node %u, but %u is the owner! "
 				     "(%.*s)\n", assert->node_idx, 
@@ -1273,6 +1280,7 @@
 			}
 
 		}
+ok:
 		spin_unlock(&res->spinlock);
 	}
 	spin_unlock(&dlm->spinlock);