Commit 94610610 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Remove unused function from glock.c 



The callback for iopen locks is unused, so this removes
it.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent a5e08a9e

fs/gfs2/glock.c

+2 −20
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static rwlock_t gl_hash_locks[GL_HASH_LOCK_SZ]; 


static inline rwlock_t *gl_lock_addr(unsigned int x)

{

	return &gl_hash_locks[(x) & (GL_HASH_LOCK_SZ-1)];

	return &gl_hash_locks[x & (GL_HASH_LOCK_SZ-1)];

}

#else /* not SMP, so no spinlocks required */

static inline rwlock_t *gl_lock_addr(x)
@@ -1805,22 +1805,6 @@ void gfs2_glock_cb(void *cb_data, unsigned int type, void *data) 
	}

}



/**

 * gfs2_iopen_go_callback - Try to kick the inode/vnode associated with an

 *                          iopen glock from memory

 * @io_gl: the iopen glock

 * @state: the state into which the glock should be put

 *

 */



void gfs2_iopen_go_callback(struct gfs2_glock *io_gl, unsigned int state)

{



	if (state != LM_ST_UNLOCKED)

		return;

	/* FIXME: remove this? */

}



/**

 * demote_ok - Check to see if it's ok to unlock a glock

 * @gl: the glock
@@ -2000,10 +1984,8 @@ void gfs2_scand_internal(struct gfs2_sbd *sdp) 
{

	unsigned int x;



	for (x = 0; x < GFS2_GL_HASH_SIZE; x++) {

	for (x = 0; x < GFS2_GL_HASH_SIZE; x++)

		examine_bucket(scan_glock, sdp, x);

		cond_resched();

	}

}



/**

fs/gfs2/glock.h

+0 −2
Original line number Diff line number Diff line
@@ -142,8 +142,6 @@ void gfs2_lvb_unhold(struct gfs2_glock *gl); 


void gfs2_glock_cb(void *cb_data, unsigned int type, void *data);



void gfs2_iopen_go_callback(struct gfs2_glock *gl, unsigned int state);



void gfs2_glock_schedule_for_reclaim(struct gfs2_glock *gl);

void gfs2_reclaim_glock(struct gfs2_sbd *sdp);

fs/gfs2/glops.c

+0 −1
Original line number Diff line number Diff line
@@ -529,7 +529,6 @@ const struct gfs2_glock_operations gfs2_trans_glops = { 
const struct gfs2_glock_operations gfs2_iopen_glops = {

	.go_xmote_th = gfs2_glock_xmote_th,

	.go_drop_th = gfs2_glock_drop_th,

	.go_callback = gfs2_iopen_go_callback,

	.go_type = LM_TYPE_IOPEN,

};