aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/dlm/dlmconvert.c
diff options
context:
space:
mode:
authorKurt Hackel <kurt.hackel@oracle.com>2006-03-02 19:43:36 -0500
committerMark Fasheh <mark.fasheh@oracle.com>2006-03-24 17:58:27 -0500
commit29004858a76ba9e26393dd8a85e653f105a33753 (patch)
treeaf526aed90f438d211e543ce7e8f2d8a1fa093e7 /fs/ocfs2/dlm/dlmconvert.c
parent70bacbdbfa6f63f8cd10432891f9ecee62397ff2 (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/dlmconvert.c')
-rw-r--r--fs/ocfs2/dlm/dlmconvert.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/ocfs2/dlm/dlmconvert.c b/fs/ocfs2/dlm/dlmconvert.c
index f66e2d818ccd..8285228d9e37 100644
--- a/fs/ocfs2/dlm/dlmconvert.c
+++ b/fs/ocfs2/dlm/dlmconvert.c
@@ -284,8 +284,10 @@ enum dlm_status dlmconvert_remote(struct dlm_ctxt *dlm,
284 if (lock->ml.convert_type != LKM_IVMODE) { 284 if (lock->ml.convert_type != LKM_IVMODE) {
285 __dlm_print_one_lock_resource(res); 285 __dlm_print_one_lock_resource(res);
286 mlog(ML_ERROR, "converting a remote lock that is already " 286 mlog(ML_ERROR, "converting a remote lock that is already "
287 "converting! (cookie=%"MLFu64", conv=%d)\n", 287 "converting! (cookie=%u:%llu, conv=%d)\n",
288 lock->ml.cookie, lock->ml.convert_type); 288 dlm_get_lock_cookie_node(lock->ml.cookie),
289 dlm_get_lock_cookie_seq(lock->ml.cookie),
290 lock->ml.convert_type);
289 status = DLM_DENIED; 291 status = DLM_DENIED;
290 goto bail; 292 goto bail;
291 } 293 }
@@ -513,8 +515,9 @@ int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data)
513leave: 515leave:
514 if (!lock) 516 if (!lock)
515 mlog(ML_ERROR, "did not find lock to convert on grant queue! " 517 mlog(ML_ERROR, "did not find lock to convert on grant queue! "
516 "cookie=%"MLFu64"\n", 518 "cookie=%u:%llu\n",
517 cnv->cookie); 519 dlm_get_lock_cookie_node(cnv->cookie),
520 dlm_get_lock_cookie_seq(cnv->cookie));
518 else 521 else
519 dlm_lock_put(lock); 522 dlm_lock_put(lock);
520 523