diff options
| -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 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, | |||
| 256 | lkb->lkb_status, | 256 | lkb->lkb_status, |
| 257 | lkb->lkb_grmode, | 257 | lkb->lkb_grmode, |
| 258 | lkb->lkb_rqmode, | 258 | lkb->lkb_rqmode, |
| 259 | lkb->lkb_highbast, | 259 | lkb->lkb_bastmode, |
| 260 | rsb_lookup, | 260 | rsb_lookup, |
| 261 | lkb->lkb_wait_type, | 261 | lkb->lkb_wait_type, |
| 262 | lkb->lkb_lvbseq, | 262 | lkb->lkb_lvbseq, |
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index d0e43a3da887..46ffd3eeaaf7 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) | |||
| 320 | { | 320 | { |
| 321 | lkb->lkb_time_bast = ktime_get(); | 321 | lkb->lkb_time_bast = ktime_get(); |
| 322 | 322 | ||
| 323 | if (is_master_copy(lkb)) | 323 | if (is_master_copy(lkb)) { |
| 324 | lkb->lkb_bastmode = rqmode; /* printed by debugfs */ | ||
| 324 | send_bast(r, lkb, rqmode); | 325 | send_bast(r, lkb, rqmode); |
| 325 | else | 326 | } else { |
| 326 | dlm_add_ast(lkb, AST_BAST, rqmode); | 327 | dlm_add_ast(lkb, AST_BAST, rqmode); |
| 328 | } | ||
| 327 | } | 329 | } |
| 328 | 330 | ||
| 329 | /* | 331 | /* |
