Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6fa8796 authored Feb 25, 2010 by David Teigland

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.

Signed-off-by: David Teigland <teigland@redhat.com>

parent b4a5d4bc

fs/dlm/debug_fs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -320,11 +320,13 @@ 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);
		}
		}

		/*
		* Basic operations on rsb's and lkb's