diff options
| author | David Teigland <teigland@redhat.com> | 2010-02-25 12:20:57 -0600 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2010-02-26 12:15:54 -0600 |
| commit | b6fa8796b2da0390e9f4115e8789a01004fc1c9b (patch) | |
| tree | 5bc3d1cea581b04d837c6cdb0fb5cd015f53f6fc /fs/dlm | |
| parent | b4a5d4bc377e49239374f266f0a0e2772c29749c (diff) | |
| download | kernel_samsung_smdk4412-b6fa8796b2da0390e9f4115e8789a01004fc1c9b.zip kernel_samsung_smdk4412-b6fa8796b2da0390e9f4115e8789a01004fc1c9b.tar.gz kernel_samsung_smdk4412-b6fa8796b2da0390e9f4115e8789a01004fc1c9b.tar.bz2 | |
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>
Diffstat (limited to 'fs/dlm')
| -rw-r--r-- | fs/dlm/debug_fs.c | 2 | ||||
| -rw-r--r-- | fs/dlm/lock.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c index 375a235..29d6139 100644 --- a/fs/dlm/debug_fs.c +++ b/fs/dlm/debug_fs.c @@ -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, diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index d0e43a3..46ffd3e 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -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); + } } /* |