diff options
Diffstat (limited to 'fs/dlm/device.c')
-rw-r--r-- | fs/dlm/device.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/dlm/device.c b/fs/dlm/device.c index 899d4f92a4d7..99d8b6b07fba 100644 --- a/fs/dlm/device.c +++ b/fs/dlm/device.c | |||
@@ -532,8 +532,7 @@ static int dlm_close(struct inode *inode, struct file *file) | |||
532 | status = dlm_lock(f->fi_ls->ls_lockspace, | 532 | status = dlm_lock(f->fi_ls->ls_lockspace, |
533 | old_li->li_grmode, &li.li_lksb, | 533 | old_li->li_grmode, &li.li_lksb, |
534 | DLM_LKF_CONVERT|DLM_LKF_ORPHAN, | 534 | DLM_LKF_CONVERT|DLM_LKF_ORPHAN, |
535 | NULL, 0, 0, ast_routine, NULL, | 535 | NULL, 0, 0, ast_routine, NULL, NULL); |
536 | NULL, NULL); | ||
537 | if (status != 0) | 536 | if (status != 0) |
538 | printk("dlm: Error orphaning lock %x: %d\n", | 537 | printk("dlm: Error orphaning lock %x: %d\n", |
539 | old_li->li_lksb.sb_lkid, status); | 538 | old_li->li_lksb.sb_lkid, status); |
@@ -878,8 +877,7 @@ static int do_user_lock(struct file_info *fi, uint8_t cmd, | |||
878 | ast_routine, | 877 | ast_routine, |
879 | li, | 878 | li, |
880 | (li->li_pend_bastaddr || li->li_bastaddr) ? | 879 | (li->li_pend_bastaddr || li->li_bastaddr) ? |
881 | bast_routine : NULL, | 880 | bast_routine : NULL); |
882 | kparams->range.ra_end ? &kparams->range : NULL); | ||
883 | if (status) | 881 | if (status) |
884 | goto out_err; | 882 | goto out_err; |
885 | 883 | ||