diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 17:19:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 17:19:30 -0800 |
| commit | 4cbd55188fe01f22783815cbb6d4f55a0ebf5969 (patch) | |
| tree | cbefb228c717bc53542452b44d5349c3665845ee /fs/dlm/debug_fs.c | |
| parent | b305956abc3c50c52598bbf39b7a5f4850058ba8 (diff) | |
| parent | b6fa8796b2da0390e9f4115e8789a01004fc1c9b (diff) | |
| download | linux-stable-4cbd55188fe01f22783815cbb6d4f55a0ebf5969.tar.gz linux-stable-4cbd55188fe01f22783815cbb6d4f55a0ebf5969.tar.bz2 linux-stable-4cbd55188fe01f22783815cbb6d4f55a0ebf5969.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
dlm: use bastmode in debugfs output
dlm: Send lockspace name with uevents
dlm: send reply before bast
dlm: fix ordering of bast and cast
Diffstat (limited to 'fs/dlm/debug_fs.c')
| -rw-r--r-- | fs/dlm/debug_fs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c index 375a2359b3bf..29d6139c35fc 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, |