summaryrefslogtreecommitdiffstats
path: root/fs/dlm/device.c
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2006-02-23 09:56:38 +0000
committerSteven Whitehouse <swhiteho@redhat.com>2006-02-23 09:56:38 +0000
commit3bcd3687f895f178fa8480a7bcc47a363817354a (patch)
tree13e64d5b9576b47401620aaada846f3c9c874cda /fs/dlm/device.c
parentd35462b4bb847b68321c55e95c926aa485aecce2 (diff)
downloadop-kernel-dev-3bcd3687f895f178fa8480a7bcc47a363817354a.zip
op-kernel-dev-3bcd3687f895f178fa8480a7bcc47a363817354a.tar.gz
[DLM] Remove range locks from the DLM
This patch removes support for range locking from the DLM Signed-off-by: David Teigland <teigland@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/dlm/device.c')
-rw-r--r--fs/dlm/device.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/dlm/device.c b/fs/dlm/device.c
index 899d4f9..99d8b6b 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)
status = dlm_lock(f->fi_ls->ls_lockspace,
old_li->li_grmode, &li.li_lksb,
DLM_LKF_CONVERT|DLM_LKF_ORPHAN,
- NULL, 0, 0, ast_routine, NULL,
- NULL, NULL);
+ NULL, 0, 0, ast_routine, NULL, NULL);
if (status != 0)
printk("dlm: Error orphaning lock %x: %d\n",
old_li->li_lksb.sb_lkid, status);
@@ -878,8 +877,7 @@ static int do_user_lock(struct file_info *fi, uint8_t cmd,
ast_routine,
li,
(li->li_pend_bastaddr || li->li_bastaddr) ?
- bast_routine : NULL,
- kparams->range.ra_end ? &kparams->range : NULL);
+ bast_routine : NULL);
if (status)
goto out_err;
OpenPOWER on IntegriCloud