Commit 5ce311eb authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[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: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 1c089c32

fs/gfs2/lm_interface.h

+0 −1
Original line number Diff line number Diff line
@@ -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

fs/gfs2/locking/dlm/lock.c

+0 −17
Original line number Diff line number Diff line
@@ -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;

fs/gfs2/locking/dlm/lock_dlm.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */

fs/gfs2/locking/dlm/mount.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

};

fs/gfs2/locking/nolock/main.c

+0 −12
Original line number Diff line number Diff line
@@ -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,