Skip to content

Commit

Permalink
[GFS2] Remove unused function from glock.c
Browse files Browse the repository at this point in the history
The callback for iopen locks is unused, so this removes
it.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
  • Loading branch information
Steven Whitehouse committed Sep 9, 2006
1 parent a5e08a9 commit 9461061
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 23 deletions.
22 changes: 2 additions & 20 deletions fs/gfs2/glock.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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();
}
}

/**
Expand Down
2 changes: 0 additions & 2 deletions fs/gfs2/glock.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
1 change: 0 additions & 1 deletion fs/gfs2/glops.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down

0 comments on commit 9461061

Please sign in to comment.