diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 08:50:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 08:50:56 -0800 |
| commit | 0c50527379496bb7a662f181d0baf0bf2c7a88a6 (patch) | |
| tree | 93134000bcc725f2ae4679f8d9f434ae17f2480d /fs/ocfs2/dlm/dlmunlock.c | |
| parent | 7d14f145f839b5d0d221ea209b4998f93267e2ec (diff) | |
| parent | ea8aa68d36026c4c3d938170b06957aeac9682f4 (diff) | |
| download | talos-op-linux-0c50527379496bb7a662f181d0baf0bf2c7a88a6.tar.gz talos-op-linux-0c50527379496bb7a662f181d0baf0bf2c7a88a6.zip | |
Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
* 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2:
ocfs2: finally remove MLF* macros
ocfs2: don't use MLF* in the file system
ocfs2: don't use MLF* in dlm/ files
ocfs2: don't use MLF* in cluster/ files
[PATCH] ocfs2: dlm recovery fixes
[PATCH] ocfs2: fix hang in dlm lock resource mastery
ocfs2: use __attribute__ format
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: if (actions & DLM_UNLOCK_FREE_LOCK) { /* this should always be coupled with list removal */ BUG_ON(!(actions & DLM_UNLOCK_REMOVE_LOCK)); - mlog(0, "lock %"MLFu64" should be gone now! refs=%d\n", - lock->ml.cookie, atomic_read(&lock->lock_refs.refcount)-1); + mlog(0, "lock %u:%llu should be gone now! refs=%d\n", + dlm_get_lock_cookie_node(lock->ml.cookie), + dlm_get_lock_cookie_seq(lock->ml.cookie), + atomic_read(&lock->lock_refs.refcount)-1); dlm_lock_put(lock); } if (actions & DLM_UNLOCK_CALL_AST) @@ -493,8 +495,9 @@ int dlm_unlock_lock_handler(struct o2net_msg *msg, u32 len, void *data) not_found: if (!found) mlog(ML_ERROR, "failed to find lock to unlock! " - "cookie=%"MLFu64"\n", - unlock->cookie); + "cookie=%u:%llu\n", + dlm_get_lock_cookie_node(unlock->cookie), + dlm_get_lock_cookie_seq(unlock->cookie)); else { /* send the lksb->status back to the other node */ status = lksb->status; |
