aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/glock.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2007-11-01 05:26:54 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2008-01-25 03:07:37 -0500
commitc2932e03dbcfe7ea9052953dbd5f3157183c1e9b (patch)
tree4d72603f5fc136a0ad0fd65b423045d5d30e69ef /fs/gfs2/glock.c
parent60b0d0877986b8fa70148f06055422d2ed858e88 (diff)
[GFS2] Remove "reclaim limit"
This call to reclaim glocks is not needed, and in particular we don't want it in the fast path for locking glocks. The limit was entirely arbitrary anyway and we can't expect users to adjust things like this, the remaining code will do the right thing on its own. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/glock.c')
-rw-r--r--fs/gfs2/glock.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 104e83ff874f..159a5479c4e4 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -507,21 +507,12 @@ static int rq_mutex(struct gfs2_holder *gh)
507static int rq_promote(struct gfs2_holder *gh) 507static int rq_promote(struct gfs2_holder *gh)
508{ 508{
509 struct gfs2_glock *gl = gh->gh_gl; 509 struct gfs2_glock *gl = gh->gh_gl;
510 struct gfs2_sbd *sdp = gl->gl_sbd;
511 510
512 if (!relaxed_state_ok(gl->gl_state, gh->gh_state, gh->gh_flags)) { 511 if (!relaxed_state_ok(gl->gl_state, gh->gh_state, gh->gh_flags)) {
513 if (list_empty(&gl->gl_holders)) { 512 if (list_empty(&gl->gl_holders)) {
514 gl->gl_req_gh = gh; 513 gl->gl_req_gh = gh;
515 set_bit(GLF_LOCK, &gl->gl_flags); 514 set_bit(GLF_LOCK, &gl->gl_flags);
516 spin_unlock(&gl->gl_spin); 515 spin_unlock(&gl->gl_spin);
517
518 if (atomic_read(&sdp->sd_reclaim_count) >
519 gfs2_tune_get(sdp, gt_reclaim_limit) &&
520 !(gh->gh_flags & LM_FLAG_PRIORITY)) {
521 gfs2_reclaim_glock(sdp);
522 gfs2_reclaim_glock(sdp);
523 }
524
525 gfs2_glock_xmote_th(gh->gh_gl, gh); 516 gfs2_glock_xmote_th(gh->gh_gl, gh);
526 spin_lock(&gl->gl_spin); 517 spin_lock(&gl->gl_spin);
527 } 518 }