From ec43146aabd7c1a1bd0f22409901fb342fdcc263 Mon Sep 17 00:00:00 2001 From: Kurt Hackel Date: Thu, 27 Apr 2006 19:03:18 -0700 Subject: [PATCH] --- yaml --- r: 30675 b: refs/heads/master c: dc2ed195dda848c8e4b24f3f0e1952fa74f74f6b h: refs/heads/master i: 30673: 833f48f7e6030165116858975d1c262ba0afd3bd 30671: d1ab6fb9b527dd66578016c344bf3f85ba4cd999 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/dlm/dlmmaster.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fd84b3718242..234845d3794d 100644 --- 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 index 0b7e29e916ed..1b28d3eedac7 100644 --- 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",