diff options
author | Kurt Hackel <kurt.hackel@oracle.com> | 2006-03-02 19:43:36 -0500 |
---|---|---|
committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-03-24 17:58:27 -0500 |
commit | 29004858a76ba9e26393dd8a85e653f105a33753 (patch) | |
tree | af526aed90f438d211e543ce7e8f2d8a1fa093e7 /fs/ocfs2/dlm/dlmunlock.c | |
parent | 70bacbdbfa6f63f8cd10432891f9ecee62397ff2 (diff) |
ocfs2: don't use MLF* in dlm/ files
Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/dlm/dlmunlock.c')
-rw-r--r-- | fs/ocfs2/dlm/dlmunlock.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/ocfs2/dlm/dlmunlock.c b/fs/ocfs2/dlm/dlmunlock.c index c95f08d2e925..7b1a27542674 100644 --- a/fs/ocfs2/dlm/dlmunlock.c +++ b/fs/ocfs2/dlm/dlmunlock.c | |||
@@ -244,8 +244,10 @@ leave: | |||
244 | if (actions & DLM_UNLOCK_FREE_LOCK) { | 244 | if (actions & DLM_UNLOCK_FREE_LOCK) { |
245 | /* this should always be coupled with list removal */ | 245 | /* this should always be coupled with list removal */ |
246 | BUG_ON(!(actions & DLM_UNLOCK_REMOVE_LOCK)); | 246 | BUG_ON(!(actions & DLM_UNLOCK_REMOVE_LOCK)); |
247 | mlog(0, "lock %"MLFu64" should be gone now! refs=%d\n", | 247 | mlog(0, "lock %u:%llu should be gone now! refs=%d\n", |
248 | lock->ml.cookie, atomic_read(&lock->lock_refs.refcount)-1); | 248 | dlm_get_lock_cookie_node(lock->ml.cookie), |
249 | dlm_get_lock_cookie_seq(lock->ml.cookie), | ||
250 | atomic_read(&lock->lock_refs.refcount)-1); | ||
249 | dlm_lock_put(lock); | 251 | dlm_lock_put(lock); |
250 | } | 252 | } |
251 | if (actions & DLM_UNLOCK_CALL_AST) | 253 | if (actions & DLM_UNLOCK_CALL_AST) |
@@ -493,8 +495,9 @@ int dlm_unlock_lock_handler(struct o2net_msg *msg, u32 len, void *data) | |||
493 | not_found: | 495 | not_found: |
494 | if (!found) | 496 | if (!found) |
495 | mlog(ML_ERROR, "failed to find lock to unlock! " | 497 | mlog(ML_ERROR, "failed to find lock to unlock! " |
496 | "cookie=%"MLFu64"\n", | 498 | "cookie=%u:%llu\n", |
497 | unlock->cookie); | 499 | dlm_get_lock_cookie_node(unlock->cookie), |
500 | dlm_get_lock_cookie_seq(unlock->cookie)); | ||
498 | else { | 501 | else { |
499 | /* send the lksb->status back to the other node */ | 502 | /* send the lksb->status back to the other node */ |
500 | status = lksb->status; | 503 | status = lksb->status; |