aboutsummaryrefslogtreecommitdiff
path: root/fs/gfs2
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/glock.c22
-rw-r--r--fs/gfs2/glock.h2
-rw-r--r--fs/gfs2/glops.c1
3 files changed, 2 insertions, 23 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index e941183bbcd..b348053c436 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -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)
@@ -1806,22 +1806,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();
- }
}
/**
diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h
index 52b8a308635..2b2a889ee2c 100644
--- a/fs/gfs2/glock.h
+++ b/fs/gfs2/glock.h
@@ -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);
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index 0c50a720d01..d3aef74ea5d 100644
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -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,
};