---

yaml --- r: 38618 b: refs/heads/master c: 8d3b35a h: refs/heads/master v: v3
git-mirror · Feb 23, 2006 · e1c0896 · e1c0896
1 parent f93c2cd
commit e1c0896
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bcd3687f895f178fa8480a7bcc47a363817354a
+refs/heads/master: 8d3b35a4af87965d1873872b21e504558f62116a
diff --git a/trunk/fs/gfs2/locking/dlm/lock.c b/trunk/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/trunk/fs/gfs2/locking/dlm/lock_dlm.h b/trunk/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/trunk/fs/gfs2/locking/dlm/thread.c b/trunk/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);