summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/locking
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-09-07 17:35:48 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-09-07 17:35:48 -0400
commit5ce311ebdb90429519f7c6d2092e4ae6ca8cba74 (patch)
tree7492b442e0d18a7aa745e696e6595856f8becfe5 /fs/gfs2/locking
parent1c089c325d5cda0f64a3cf8edf3aaafa148f200a (diff)
downloadop-kernel-dev-5ce311ebdb90429519f7c6d2092e4ae6ca8cba74.zip
op-kernel-dev-5ce311ebdb90429519f7c6d2092e4ae6ca8cba74.tar.gz
[GFS2] Remove unused sync_lvb code from lock modules
This code is no longer used for anything and can be removed from the locking modules. The sync_lvb function is not required as this happens automatically with the current locking system. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/locking')
-rw-r--r--fs/gfs2/locking/dlm/lock.c17
-rw-r--r--fs/gfs2/locking/dlm/lock_dlm.h1
-rw-r--r--fs/gfs2/locking/dlm/mount.c1
-rw-r--r--fs/gfs2/locking/nolock/main.c12
4 files changed, 0 insertions, 31 deletions
diff --git a/fs/gfs2/locking/dlm/lock.c b/fs/gfs2/locking/dlm/lock.c
index dceea41..e4359b1 100644
--- a/fs/gfs2/locking/dlm/lock.c
+++ b/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/fs/gfs2/locking/dlm/lock_dlm.h b/fs/gfs2/locking/dlm/lock_dlm.h
index e6898d2..a4f534a 100644
--- a/fs/gfs2/locking/dlm/lock_dlm.h
+++ b/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/fs/gfs2/locking/dlm/mount.c b/fs/gfs2/locking/dlm/mount.c
index 8a1764f..832fb81 100644
--- a/fs/gfs2/locking/dlm/mount.c
+++ b/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/fs/gfs2/locking/nolock/main.c b/fs/gfs2/locking/nolock/main.c
index e326079..ba73997 100644
--- a/fs/gfs2/locking/nolock/main.c
+++ b/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,
OpenPOWER on IntegriCloud