---

yaml --- r: 38841 b: refs/heads/master c: 5ce311e h: refs/heads/master i: 38839: c9a1875 v: v3
git-mirror · Sep 7, 2006 · 1d7b4d7 · 1d7b4d7
1 parent cac770d
commit 1d7b4d7
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 33 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c089c325d5cda0f64a3cf8edf3aaafa148f200a
+refs/heads/master: 5ce311ebdb90429519f7c6d2092e4ae6ca8cba74
diff --git a/trunk/fs/gfs2/lm_interface.h b/trunk/fs/gfs2/lm_interface.h
@@ -211,7 +211,6 @@ struct lm_lockops {
 
 	int (*lm_hold_lvb) (lm_lock_t *lock, char **lvbp);
 	void (*lm_unhold_lvb) (lm_lock_t *lock, char *lvb);
-	void (*lm_sync_lvb) (lm_lock_t *lock, char *lvb);
 
 	/*
 	 * Posix Lock oriented operations

diff --git a/trunk/fs/gfs2/locking/dlm/lock.c b/trunk/fs/gfs2/locking/dlm/lock.c
@@ -490,23 +490,6 @@ void gdlm_unhold_lvb(lm_lock_t *lock, char *lvb)
 	gdlm_del_lvb(lp);
 }
 
-void gdlm_sync_lvb(lm_lock_t *lock, char *lvb)
-{
-	struct gdlm_lock *lp = (struct gdlm_lock *) lock;
-
-	if (lp->cur != DLM_LOCK_EX)
-		return;
-
-	init_completion(&lp->ast_wait);
-	set_bit(LFL_SYNC_LVB, &lp->flags);
-
-	lp->req = DLM_LOCK_EX;
-	lp->lkf = make_flags(lp, 0, lp->cur, lp->req);
-
-	gdlm_do_lock(lp);
-	wait_for_completion(&lp->ast_wait);
-}
-
 void gdlm_submit_delayed(struct gdlm_ls *ls)
 {
 	struct gdlm_lock *lp, *safe;

diff --git a/trunk/fs/gfs2/locking/dlm/lock_dlm.h b/trunk/fs/gfs2/locking/dlm/lock_dlm.h
@@ -172,7 +172,6 @@ unsigned int gdlm_unlock(lm_lock_t *, unsigned int);
 void gdlm_cancel(lm_lock_t *);
 int gdlm_hold_lvb(lm_lock_t *, char **);
 void gdlm_unhold_lvb(lm_lock_t *, char *);
-void gdlm_sync_lvb(lm_lock_t *, char *);
 
 /* plock.c */
 

diff --git a/trunk/fs/gfs2/locking/dlm/mount.c b/trunk/fs/gfs2/locking/dlm/mount.c
@@ -249,7 +249,6 @@ struct lm_lockops gdlm_ops = {
 	.lm_cancel = gdlm_cancel,
 	.lm_hold_lvb = gdlm_hold_lvb,
 	.lm_unhold_lvb = gdlm_unhold_lvb,
-	.lm_sync_lvb = gdlm_sync_lvb,
 	.lm_recovery_done = gdlm_recovery_done,
 	.lm_owner = THIS_MODULE,
 };

diff --git a/trunk/fs/gfs2/locking/nolock/main.c b/trunk/fs/gfs2/locking/nolock/main.c
@@ -162,17 +162,6 @@ static void nolock_unhold_lvb(lm_lock_t *lock, char *lvb)
 	kfree(lvb);
 }
 
-/**
- * nolock_sync_lvb - sync out the value of a lvb
- * @lock: the lock the LVB is associated with
- * @lvb: the lock value block
- *
- */
-
-static void nolock_sync_lvb(lm_lock_t *lock, char *lvb)
-{
-}
-
 static int nolock_plock_get(lm_lockspace_t *lockspace, struct lm_lockname *name,
 			    struct file *file, struct file_lock *fl)
 {
@@ -221,7 +210,6 @@ static struct lm_lockops nolock_ops = {
 	.lm_cancel = nolock_cancel,
 	.lm_hold_lvb = nolock_hold_lvb,
 	.lm_unhold_lvb = nolock_unhold_lvb,
-	.lm_sync_lvb = nolock_sync_lvb,
 	.lm_plock_get = nolock_plock_get,
 	.lm_plock = nolock_plock,
 	.lm_punlock = nolock_punlock,