Attachment 213411 Details for Bug 221152 – The fifth of five patches

[patch] The fifth of five patches

gl-clean-5.diff (text/plain), 3.82 KB, created by Steve Whitehouse on 2007-10-02 13:38:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2007-10-02 13:38:58 UTC

Size: 3.82 KB

patch

obsolete

>From swhiteho@redhat.com Mon Jul 30 05:54:21 2007
>Return-Path: <swhiteho@redhat.com>
>Received: from pobox.fab.redhat.com ([unix socket]) by pobox.fab.redhat.com
>	(Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA; Mon, 30 Jul 2007
>	05:54:21 -0400
>X-Sieve: CMU Sieve 2.2
>Received: from localhost.localdomain (vpn-14-116.rdu.redhat.com
>	[10.11.14.116]) by pobox.fab.redhat.com (8.13.1/8.13.1) with ESMTP id
>	l6U9sCFt014089; Mon, 30 Jul 2007 05:54:20 -0400
>From: Steven Whitehouse <swhiteho@redhat.com>
>To: cluster-devel@redhat.com
>Cc: Steven Whitehouse <swhiteho@redhat.com>
>Subject: [PATCH] [GFs2] Remove reclaim logic from rq_promote()
>Date: Mon, 30 Jul 2007 10:32:18 +0100
>Message-Id: <11857879523305-git-send-email-swhiteho@redhat.com>
>X-Mailer: git-send-email 1.5.1.2
>In-Reply-To: <11857879512912-git-send-email-swhiteho@redhat.com>
>References: <11857879381186-git-send-email-swhiteho@redhat.com>
>	 <1185787946183-git-send-email-swhiteho@redhat.com>
>	 <11857879472203-git-send-email-swhiteho@redhat.com>
>	 <11857879493817-git-send-email-swhiteho@redhat.com>
>	 <11857879512912-git-send-email-swhiteho@redhat.com>
>X-Evolution-Source: imap://swhiteho@pobox.fab.redhat.com/
>Content-Transfer-Encoding: 8bit
>Mime-Version: 1.0
>
>There is no need to reclaim glocks in this code path since
>the glockd does this for us anyway. Also the limit of 5000
>is entirely aribtrary and it doesn't make sense to slow down
>this (fast path) when its not actually responsible for generating
>reclaimable glocks.
>
>Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
>
>diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
>index 6324f57..be0368b 100644
>--- a/fs/gfs2/glock.c
>+++ b/fs/gfs2/glock.c
>@@ -481,7 +481,6 @@ static int rq_promote(struct gfs2_glock *gl)
> {
> 	struct gfs2_holder *gh = list_entry(gl->gl_waiters3.next,
> 					    struct gfs2_holder, gh_list);
>-	struct gfs2_sbd *sdp = gl->gl_sbd;
> 
> 	BUG_ON(test_bit(HIF_PROMOTE, &gh->gh_iflags) == 0);
> 	if (!relaxed_state_ok(gl->gl_state, gh->gh_state, gh->gh_flags)) {
>@@ -489,14 +488,6 @@ static int rq_promote(struct gfs2_glock *gl)
> 			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 8b91f83..4a48ded 100644
>--- a/fs/gfs2/incore.h
>+++ b/fs/gfs2/incore.h
>@@ -446,7 +446,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 f916b97..78987db 100644
>--- a/fs/gfs2/super.c
>+++ b/fs/gfs2/super.c
>@@ -75,7 +75,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 c26c21b..b3ba9f1 100644
>--- a/fs/gfs2/sys.c
>+++ b/fs/gfs2/sys.c
>@@ -434,7 +434,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);
>@@ -458,7 +457,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,
>-- 
>1.5.1.2
>

Actions: View | Diff

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