[Cluster-devel] cluster/gfs-kernel/src/gfs glock.c
wcheng at sourceware.org
wcheng at sourceware.org
Tue Jun 26 17:38:07 UTC 2007
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL5
Changes by: wcheng at sourceware.org 2007-06-26 17:38:07
Modified files:
gfs-kernel/src/gfs: glock.c
Log message:
Bugzilla 239729:
Previous CVS check-in did a last minute change with the way purge count
was calculated in glock trimming patch. The intention was to trim glocks
evenly across all the hash buckets and apparently the size of hash array
was overlooked. It ends up with zero trimming count most of the time.
This virtually makes glock trimming patch a void feature.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/glock.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.29.2.2&r2=1.29.2.3
--- cluster/gfs-kernel/src/gfs/glock.c 2007/06/17 05:16:52 1.29.2.2
+++ cluster/gfs-kernel/src/gfs/glock.c 2007/06/26 17:38:07 1.29.2.3
@@ -2496,13 +2496,12 @@
static int
examine_bucket(glock_examiner examiner,
struct gfs_sbd *sdp, struct gfs_gl_hash_bucket *bucket,
- unsigned int purge_nr)
+ unsigned int *purge_nr)
{
struct glock_plug plug;
struct list_head *tmp;
struct gfs_glock *gl;
int entries;
- unsigned int p_cnt=purge_nr;
/* Add "plug" to end of bucket list, work back up list from there */
memset(&plug.gl_flags, 0, sizeof(unsigned long));
@@ -2543,7 +2542,7 @@
write_unlock(&bucket->hb_lock);
- examiner(gl, &p_cnt);
+ examiner(gl, &purge_nr);
}
}
@@ -2655,11 +2654,11 @@
purge_nr = 0;
else
purge_nr = (atomic_read(&sdp->sd_glock_count) -
- atomic_read(&sdp->sd_glock_held_count)) *
- sdp->sd_tune.gt_glock_purge / 100 / GFS_GL_HASH_SIZE;
+ atomic_read(&sdp->sd_glock_count)) *
+ sdp->sd_tune.gt_glock_purge / 100;
for (x = 0; x < GFS_GL_HASH_SIZE; x++) {
- examine_bucket(scan_glock, sdp, &sdp->sd_gl_hash[x], purge_nr);
+ examine_bucket(scan_glock, sdp, &sdp->sd_gl_hash[x], &purge_nr);
cond_resched();
}
}
More information about the Cluster-devel
mailing list