Attachment 241931 Details for Bug 221152 – An updated version of patch 5

[patch] An updated version of patch 5

remove-reclaim-limit.diff (text/plain), 2.20 KB, created by Steve Whitehouse on 2007-10-29 14:37:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2007-10-29 14:37:04 UTC

Size: 2.20 KB

patch

obsolete

>diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
>index 104e83f..159a547 100644
>--- a/fs/gfs2/glock.c
>+++ b/fs/gfs2/glock.c
>@@ -507,21 +507,12 @@ static int rq_mutex(struct gfs2_holder *gh)
> static int rq_promote(struct gfs2_holder *gh)
> {
> 	struct gfs2_glock *gl = gh->gh_gl;
>-	struct gfs2_sbd *sdp = gl->gl_sbd;
> 
> 	if (!relaxed_state_ok(gl->gl_state, gh->gh_state, gh->gh_flags)) {
> 		if (list_empty(&gl->gl_holders)) {
> 			gl->gl_req_gh = gh;
> 			set_bit(GLF_LOCK, &gl->gl_flags);
> 			spin_unlock(&gl->gl_spin);
>-
>-			if (atomic_read(&sdp->sd_reclaim_count) >
>-			    gfs2_tune_get(sdp, gt_reclaim_limit) &&
>-			    !(gh->gh_flags & LM_FLAG_PRIORITY)) {
>-				gfs2_reclaim_glock(sdp);
>-				gfs2_reclaim_glock(sdp);
>-			}
>-
> 			gfs2_glock_xmote_th(gh->gh_gl, gh);
> 			spin_lock(&gl->gl_spin);
> 		}
>diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
>index 82dfe9b..d94b1df 100644
>--- a/fs/gfs2/incore.h
>+++ b/fs/gfs2/incore.h
>@@ -437,7 +437,6 @@ struct gfs2_tune {
> 	unsigned int gt_lockdump_size;
> 	unsigned int gt_stall_secs; /* Detects trouble! */
> 	unsigned int gt_complain_secs;
>-	unsigned int gt_reclaim_limit; /* Max num of glocks in reclaim list */
> 	unsigned int gt_statfs_quantum;
> 	unsigned int gt_statfs_slow;
> };
>diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
>index 5183dfb..8b3a755 100644
>--- a/fs/gfs2/super.c
>+++ b/fs/gfs2/super.c
>@@ -74,7 +74,6 @@ void gfs2_tune_init(struct gfs2_tune *gt)
> 	gt->gt_lockdump_size = 131072;
> 	gt->gt_stall_secs = 600;
> 	gt->gt_complain_secs = 10;
>-	gt->gt_reclaim_limit = 5000;
> 	gt->gt_statfs_quantum = 30;
> 	gt->gt_statfs_slow = 0;
> }
>diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
>index 06e0b77..1359198 100644
>--- a/fs/gfs2/sys.c
>+++ b/fs/gfs2/sys.c
>@@ -433,7 +433,6 @@ TUNE_ATTR(quota_quantum, 0);
> TUNE_ATTR(atime_quantum, 0);
> TUNE_ATTR(max_readahead, 0);
> TUNE_ATTR(complain_secs, 0);
>-TUNE_ATTR(reclaim_limit, 0);
> TUNE_ATTR(statfs_slow, 0);
> TUNE_ATTR(new_files_jdata, 0);
> TUNE_ATTR(new_files_directio, 0);
>@@ -456,7 +455,6 @@ static struct attribute *tune_attrs[] = {
> 	&tune_attr_atime_quantum.attr,
> 	&tune_attr_max_readahead.attr,
> 	&tune_attr_complain_secs.attr,
>-	&tune_attr_reclaim_limit.attr,
> 	&tune_attr_statfs_slow.attr,
> 	&tune_attr_quota_simul_sync.attr,
> 	&tune_attr_quota_cache_secs.attr,

Actions: View | Diff

Attachments on bug 221152: 213371 | 213381 | 213391 | 213401 | 213411 | 241931