Skip to contentSkip to conversation

dlm: use bastmode in debugfs output

PATCH In review David Teigland 1 participant 1 message Feb 26, 2010 Distributed lock manager (DLM)

lore
Share & tools
lore

David Teigland

author maintainer
#0 lore raw

PATCH 4/4 dlm: use bastmode in debugfs output

The bast mode that appears in the debugfs output should be useful on both master and process nodes. lkb_highbast is currently printed, and is only useful on the master node. lkb_bastmode is only useful on the process node. This patch sets lkb_bastmode on the master node as well, and uses that value in the debugfs print.

---
 fs/dlm/debug_fs.c |    2 +-
 fs/dlm/lock.c     |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
fs/dlm/debug_fs.c +1 -1
index 375a235..29d6139 100644
@@ -256,7 +256,7 @@ static int print_format3_lock(struct seq_file *s, struct dlm_lkb *lkb,
 			lkb->lkb_status,
 			lkb->lkb_grmode,
 			lkb->lkb_rqmode,
-			lkb->lkb_highbast,
+			lkb->lkb_bastmode,
 			rsb_lookup,
 			lkb->lkb_wait_type,
 			lkb->lkb_lvbseq,
fs/dlm/lock.c +4 -2
index d0e43a3..46ffd3e 100644
@@ -320,10 +320,12 @@ static void queue_bast(struct dlm_rsb *r, struct dlm_lkb *lkb, int rqmode)
 {
 	lkb->lkb_time_bast = ktime_get();
 
-	if (is_master_copy(lkb))
+	if (is_master_copy(lkb)) {
+		lkb->lkb_bastmode = rqmode; /* printed by debugfs */
 		send_bast(r, lkb, rqmode);
-	else
+	} else {
 		dlm_add_ast(lkb, AST_BAST, rqmode);
+	}
 }
 
 /*
Signature · 1 line
1.6.6