linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / fs / ocfs2 / dlm / dlmdebug.c

diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c
index c7eae5d..54f61b7 100644 (file)
--- a/fs/ocfs2/dlm/dlmdebug.c
+++ b/fs/ocfs2/dlm/dlmdebug.c
@@ -72,10 +72,8 @@ void __dlm_print_one_lock_resource(struct dlm_lock_resource *res)
                lock = list_entry(iter2, struct dlm_lock, list);
                spin_lock(&lock->spinlock);
                mlog(ML_NOTICE, "    type=%d, conv=%d, node=%u, "
-                      "cookie=%u:%llu, ast=(empty=%c,pend=%c), bast=(empty=%c,pend=%c)\n", 
-                      lock->ml.type, lock->ml.convert_type, lock->ml.node, 
-                      dlm_get_lock_cookie_node(lock->ml.cookie), 
-                      dlm_get_lock_cookie_seq(lock->ml.cookie), 
+                      "cookie=%"MLFu64", ast=(empty=%c,pend=%c), bast=(empty=%c,pend=%c)\n", 
+                      lock->ml.type, lock->ml.convert_type, lock->ml.node, lock->ml.cookie, 
                       list_empty(&lock->ast_list) ? 'y' : 'n',
                       lock->ast_pending ? 'y' : 'n',
                       list_empty(&lock->bast_list) ? 'y' : 'n',
@@ -87,10 +85,8 @@ void __dlm_print_one_lock_resource(struct dlm_lock_resource *res)
                lock = list_entry(iter2, struct dlm_lock, list);
                spin_lock(&lock->spinlock);
                mlog(ML_NOTICE, "    type=%d, conv=%d, node=%u, "
-                      "cookie=%u:%llu, ast=(empty=%c,pend=%c), bast=(empty=%c,pend=%c)\n", 
-                      lock->ml.type, lock->ml.convert_type, lock->ml.node, 
-                      dlm_get_lock_cookie_node(lock->ml.cookie), 
-                      dlm_get_lock_cookie_seq(lock->ml.cookie), 
+                      "cookie=%"MLFu64", ast=(empty=%c,pend=%c), bast=(empty=%c,pend=%c)\n", 
+                      lock->ml.type, lock->ml.convert_type, lock->ml.node, lock->ml.cookie, 
                       list_empty(&lock->ast_list) ? 'y' : 'n',
                       lock->ast_pending ? 'y' : 'n',
                       list_empty(&lock->bast_list) ? 'y' : 'n',
@@ -102,10 +98,8 @@ void __dlm_print_one_lock_resource(struct dlm_lock_resource *res)
                lock = list_entry(iter2, struct dlm_lock, list);
                spin_lock(&lock->spinlock);
                mlog(ML_NOTICE, "    type=%d, conv=%d, node=%u, "
-                      "cookie=%u:%llu, ast=(empty=%c,pend=%c), bast=(empty=%c,pend=%c)\n", 
-                      lock->ml.type, lock->ml.convert_type, lock->ml.node, 
-                      dlm_get_lock_cookie_node(lock->ml.cookie), 
-                      dlm_get_lock_cookie_seq(lock->ml.cookie), 
+                      "cookie=%"MLFu64", ast=(empty=%c,pend=%c), bast=(empty=%c,pend=%c)\n", 
+                      lock->ml.type, lock->ml.convert_type, lock->ml.node, lock->ml.cookie, 
                       list_empty(&lock->ast_list) ? 'y' : 'n',
                       lock->ast_pending ? 'y' : 'n',
                       list_empty(&lock->bast_list) ? 'y' : 'n',