projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2d1a868
)
ocfs2: allow for an assert message during lock mastery
author
Kurt Hackel
<kurt.hackel@oracle.com>
Fri, 28 Apr 2006 02:03:18 +0000
(19:03 -0700)
committer
Mark Fasheh
<mark.fasheh@oracle.com>
Mon, 26 Jun 2006 21:42:54 +0000
(14:42 -0700)
Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
fs/ocfs2/dlm/dlmmaster.c
patch
|
blob
|
history
diff --git
a/fs/ocfs2/dlm/dlmmaster.c
b/fs/ocfs2/dlm/dlmmaster.c
index
0b7e29e
..
1b28d3e
100644
(file)
--- 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)
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",