---

yaml --- r: 30675 b: refs/heads/master c: dc2ed19 h: refs/heads/master i: 30673: 833f48f 30671: d1ab6fb v: v3
git-mirror · Jun 26, 2006 · ec43146 · ec43146
1 parent 01c3a70
commit ec43146
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d1a868c563f07c07c681836d273d69efb7c5ad8
+refs/heads/master: dc2ed195dda848c8e4b24f3f0e1952fa74f74f6b
diff --git a/trunk/fs/ocfs2/dlm/dlmmaster.c b/trunk/fs/ocfs2/dlm/dlmmaster.c
@@ -1741,7 +1741,8 @@ int dlm_assert_master_handler(struct o2net_msg *msg, u32 len, void *data)
 			goto kill;
 		}
 		if (!mle) {
-			if (res->owner != assert->node_idx) {
+			if (res->owner != DLM_LOCK_RES_OWNER_UNKNOWN &&
+			    res->owner != assert->node_idx) {
 				mlog(ML_ERROR, "assert_master from "
 					  "%u, but current owner is "
 					  "%u! (%.*s)\n",