diff options
author | Kurt Hackel <kurt.hackel@oracle.com> | 2006-04-27 22:03:18 -0400 |
---|---|---|
committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-06-26 17:42:54 -0400 |
commit | dc2ed195dda848c8e4b24f3f0e1952fa74f74f6b (patch) | |
tree | 708a2ed9f07ab36658735943890ce38f0fa51ebd /fs/ocfs2/dlm/dlmmaster.c | |
parent | 2d1a868c563f07c07c681836d273d69efb7c5ad8 (diff) |
ocfs2: allow for an assert message during lock mastery
Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/dlm/dlmmaster.c')
-rw-r--r-- | fs/ocfs2/dlm/dlmmaster.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c index 0b7e29e916ed..1b28d3eedac7 100644 --- a/fs/ocfs2/dlm/dlmmaster.c +++ b/fs/ocfs2/dlm/dlmmaster.c | |||
@@ -1741,7 +1741,8 @@ int dlm_assert_master_handler(struct o2net_msg *msg, u32 len, void *data) | |||
1741 | goto kill; | 1741 | goto kill; |
1742 | } | 1742 | } |
1743 | if (!mle) { | 1743 | if (!mle) { |
1744 | if (res->owner != assert->node_idx) { | 1744 | if (res->owner != DLM_LOCK_RES_OWNER_UNKNOWN && |
1745 | res->owner != assert->node_idx) { | ||
1745 | mlog(ML_ERROR, "assert_master from " | 1746 | mlog(ML_ERROR, "assert_master from " |
1746 | "%u, but current owner is " | 1747 | "%u, but current owner is " |
1747 | "%u! (%.*s)\n", | 1748 | "%u! (%.*s)\n", |