[DLM] Remove support for range locks (II)

This is the second of two patches removing support for range
locks from the DLM

Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/fs/gfs2/locking/dlm/lock.c b/fs/gfs2/locking/dlm/lock.c
index d799865b64a4..666d696dc8ce 100644
--- a/fs/gfs2/locking/dlm/lock.c
+++ b/fs/gfs2/locking/dlm/lock.c
@@ -223,7 +223,7 @@ void gdlm_put_lock(lm_lock_t *lock)
         gdlm_delete_lp((struct gdlm_lock *) lock);
 }
 
-unsigned int gdlm_do_lock(struct gdlm_lock *lp, struct dlm_range *range)
+unsigned int gdlm_do_lock(struct gdlm_lock *lp)
 {
         struct gdlm_ls *ls = lp->ls;
         struct gdlm_strname str;
@@ -258,7 +258,7 @@ unsigned int gdlm_do_lock(struct gdlm_lock *lp, struct dlm_range *range)
 
         error = dlm_lock(ls->dlm_lockspace, lp->req, &lp->lksb, lp->lkf,
                          str.name, str.namelen, 0, gdlm_ast, (void *) lp,
-                         bast ? gdlm_bast : NULL, range);
+                         bast ? gdlm_bast : NULL);
 
         if ((error == -EAGAIN) && (lp->lkf & DLM_LKF_NOQUEUE)) {
                 lp->lksb.sb_status = -EAGAIN;
@@ -316,7 +316,7 @@ unsigned int gdlm_lock(lm_lock_t *lock, unsigned int cur_state,
         lp->req = make_mode(req_state);
         lp->lkf = make_flags(lp, flags, lp->cur, lp->req);
 
-        return gdlm_do_lock(lp, NULL);
+        return gdlm_do_lock(lp);
 }
 
 unsigned int gdlm_unlock(lm_lock_t *lock, unsigned int cur_state)
@@ -425,7 +425,7 @@ static int hold_null_lock(struct gdlm_lock *lp)
         set_bit(LFL_INLOCK, &lpn->flags);
 
         init_completion(&lpn->ast_wait);
-        gdlm_do_lock(lpn, NULL);
+        gdlm_do_lock(lpn);
         wait_for_completion(&lpn->ast_wait);
         error = lp->lksb.sb_status;
         if (error) {
@@ -499,7 +499,7 @@ void gdlm_sync_lvb(lm_lock_t *lock, char *lvb)
         lp->req = DLM_LOCK_EX;
         lp->lkf = make_flags(lp, 0, lp->cur, lp->req);
 
-        gdlm_do_lock(lp, NULL);
+        gdlm_do_lock(lp);
         wait_for_completion(&lp->ast_wait);
 }
 
diff --git a/fs/gfs2/locking/dlm/lock_dlm.h b/fs/gfs2/locking/dlm/lock_dlm.h
index fa545f7872e8..6d76146953ce 100644
--- a/fs/gfs2/locking/dlm/lock_dlm.h
+++ b/fs/gfs2/locking/dlm/lock_dlm.h
@@ -165,7 +165,7 @@ int gdlm_create_lp(struct gdlm_ls *, struct lm_lockname *, struct gdlm_lock **);
 void gdlm_delete_lp(struct gdlm_lock *);
 int gdlm_add_lvb(struct gdlm_lock *);
 void gdlm_del_lvb(struct gdlm_lock *);
-unsigned int gdlm_do_lock(struct gdlm_lock *, struct dlm_range *);
+unsigned int gdlm_do_lock(struct gdlm_lock *);
 unsigned int gdlm_do_unlock(struct gdlm_lock *);
 
 int gdlm_get_lock(lm_lockspace_t *, struct lm_lockname *, lm_lock_t **);
diff --git a/fs/gfs2/locking/dlm/thread.c b/fs/gfs2/locking/dlm/thread.c
index 6fe669cd334b..3e2edcc2dbf6 100644
--- a/fs/gfs2/locking/dlm/thread.c
+++ b/fs/gfs2/locking/dlm/thread.c
@@ -308,7 +308,7 @@ static int gdlm_thread(void *data)
                         process_blocking(lp, blocking);
 
                 else if (submit)
-                        gdlm_do_lock(lp, NULL);
+                        gdlm_do_lock(lp);
 
                 if (drop)
                         ls->fscb(ls->fsdata, LM_CB_DROPLOCKS, NULL);