aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/dlm/dlmrecovery.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/dlmrecovery.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/dlmrecovery.c')
-rw-r--r--fs/ocfs2/dlm/dlmrecovery.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index 36610bdf1231..805cbabac051 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -744,10 +744,12 @@ static void dlm_request_all_locks_worker(struct dlm_work_item *item, void *data)
744 dlm->name, dlm->reco.dead_node, dlm->reco.new_master, 744 dlm->name, dlm->reco.dead_node, dlm->reco.new_master,
745 dead_node, reco_master); 745 dead_node, reco_master);
746 mlog(ML_ERROR, "%s: name=%.*s master=%u locks=%u/%u flags=%u " 746 mlog(ML_ERROR, "%s: name=%.*s master=%u locks=%u/%u flags=%u "
747 "entry[0]={c=%"MLFu64",l=%u,f=%u,t=%d,ct=%d,hb=%d,n=%u}\n", 747 "entry[0]={c=%u:%llu,l=%u,f=%u,t=%d,ct=%d,hb=%d,n=%u}\n",
748 dlm->name, mres->lockname_len, mres->lockname, mres->master, 748 dlm->name, mres->lockname_len, mres->lockname, mres->master,
749 mres->num_locks, mres->total_locks, mres->flags, 749 mres->num_locks, mres->total_locks, mres->flags,
750 mres->ml[0].cookie, mres->ml[0].list, mres->ml[0].flags, 750 dlm_get_lock_cookie_node(mres->ml[0].cookie),
751 dlm_get_lock_cookie_seq(mres->ml[0].cookie),
752 mres->ml[0].list, mres->ml[0].flags,
751 mres->ml[0].type, mres->ml[0].convert_type, 753 mres->ml[0].type, mres->ml[0].convert_type,
752 mres->ml[0].highest_blocked, mres->ml[0].node); 754 mres->ml[0].highest_blocked, mres->ml[0].node);
753 BUG(); 755 BUG();
@@ -1513,9 +1515,11 @@ static int dlm_process_recovery_data(struct dlm_ctxt *dlm,
1513 /* lock is always created locally first, and 1515 /* lock is always created locally first, and
1514 * destroyed locally last. it must be on the list */ 1516 * destroyed locally last. it must be on the list */
1515 if (!lock) { 1517 if (!lock) {
1518 u64 c = ml->cookie;
1516 mlog(ML_ERROR, "could not find local lock " 1519 mlog(ML_ERROR, "could not find local lock "
1517 "with cookie %"MLFu64"!\n", 1520 "with cookie %u:%llu!\n",
1518 ml->cookie); 1521 dlm_get_lock_cookie_node(c),
1522 dlm_get_lock_cookie_seq(c));
1519 BUG(); 1523 BUG();
1520 } 1524 }
1521 BUG_ON(lock->ml.node != ml->node); 1525 BUG_ON(lock->ml.node != ml->node);