Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fbbfd21 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Reduce number of gfs2_scand processes to one 



We only need a single gfs2_scand process rather than the one
per filesystem which we had previously. As a result the parameter
determining the frequency of gfs2_scand runs becomes a module
parameter rather than a mount parameter as it was before.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent ca5a939b

fs/gfs2/daemon.c

+0 −24
Original line number Original line Diff line number Diff line
@@ -34,30 +34,6 @@ 




   The kthread functions used to start these daemons block and flush signals. */

   The kthread functions used to start these daemons block and flush signals. */





/**

 * gfs2_scand - Look for cached glocks and inodes to toss from memory

 * @sdp: Pointer to GFS2 superblock

 *

 * One of these daemons runs, finding candidates to add to sd_reclaim_list.

 * See gfs2_glockd()

 */



int gfs2_scand(void *data)

{

	struct gfs2_sbd *sdp = data;

	unsigned long t;



	while (!kthread_should_stop()) {

		gfs2_scand_internal(sdp);

		t = gfs2_tune_get(sdp, gt_scand_secs) * HZ;

		if (freezing(current))

			refrigerator();

		schedule_timeout_interruptible(t);

	}



	return 0;

}



/**

/**

 * gfs2_glockd - Reclaim unused glock structures

 * gfs2_glockd - Reclaim unused glock structures

 * @sdp: Pointer to GFS2 superblock

 * @sdp: Pointer to GFS2 superblock

fs/gfs2/daemon.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,6 @@ 
#ifndef __DAEMON_DOT_H__

#ifndef __DAEMON_DOT_H__

#define __DAEMON_DOT_H__

#define __DAEMON_DOT_H__





int gfs2_scand(void *data);

int gfs2_glockd(void *data);

int gfs2_glockd(void *data);

int gfs2_recoverd(void *data);

int gfs2_recoverd(void *data);

int gfs2_logd(void *data);

int gfs2_logd(void *data);

fs/gfs2/glock.c

+48 −15
Original line number Original line Diff line number Diff line
@@ -25,6 +25,8 @@ 
#include <asm/uaccess.h>

#include <asm/uaccess.h>

#include <linux/seq_file.h>

#include <linux/seq_file.h>

#include <linux/debugfs.h>

#include <linux/debugfs.h>

#include <linux/kthread.h>

#include <linux/freezer.h>





#include "gfs2.h"

#include "gfs2.h"

#include "incore.h"

#include "incore.h"
@@ -58,6 +60,8 @@ static void gfs2_glock_xmote_th(struct gfs2_glock *gl, struct gfs2_holder *gh); 
static void gfs2_glock_drop_th(struct gfs2_glock *gl);

static void gfs2_glock_drop_th(struct gfs2_glock *gl);

static DECLARE_RWSEM(gfs2_umount_flush_sem);

static DECLARE_RWSEM(gfs2_umount_flush_sem);

static struct dentry *gfs2_root;

static struct dentry *gfs2_root;

static struct task_struct *scand_process;

static unsigned int scand_secs = 5;





#define GFS2_GL_HASH_SHIFT      15

#define GFS2_GL_HASH_SHIFT      15

#define GFS2_GL_HASH_SIZE       (1 << GFS2_GL_HASH_SHIFT)

#define GFS2_GL_HASH_SIZE       (1 << GFS2_GL_HASH_SHIFT)
@@ -1627,7 +1631,7 @@ static int examine_bucket(glock_examiner examiner, struct gfs2_sbd *sdp, 
		goto out;

		goto out;

	gl = list_entry(head->first, struct gfs2_glock, gl_list);

	gl = list_entry(head->first, struct gfs2_glock, gl_list);

	while(1) {

	while(1) {

		if (gl->gl_sbd == sdp) {

		if (!sdp || gl->gl_sbd == sdp) {

			gfs2_glock_hold(gl);

			gfs2_glock_hold(gl);

			read_unlock(gl_lock_addr(hash));

			read_unlock(gl_lock_addr(hash));

			if (prev)

			if (prev)
@@ -1645,6 +1649,7 @@ static int examine_bucket(glock_examiner examiner, struct gfs2_sbd *sdp, 
	read_unlock(gl_lock_addr(hash));

	read_unlock(gl_lock_addr(hash));

	if (prev)

	if (prev)

		gfs2_glock_put(prev);

		gfs2_glock_put(prev);

	cond_resched();

	return has_entries;

	return has_entries;

}

}
@@ -1672,20 +1677,6 @@ static void scan_glock(struct gfs2_glock *gl) 
	gfs2_glock_schedule_for_reclaim(gl);

	gfs2_glock_schedule_for_reclaim(gl);

}

}





/**

 * gfs2_scand_internal - Look for glocks and inodes to toss from memory

 * @sdp: the filesystem

 *

 */



void gfs2_scand_internal(struct gfs2_sbd *sdp)

{

	unsigned int x;



	for (x = 0; x < GFS2_GL_HASH_SIZE; x++)

		examine_bucket(scan_glock, sdp, x);

}



/**

/**

 * clear_glock - look at a glock and see if we can free it from glock cache

 * clear_glock - look at a glock and see if we can free it from glock cache

 * @gl: the glock to look at

 * @gl: the glock to look at
@@ -1973,6 +1964,35 @@ static int gfs2_dump_lockstate(struct gfs2_sbd *sdp) 
	return error;

	return error;

}

}





/**

 * gfs2_scand - Look for cached glocks and inodes to toss from memory

 * @sdp: Pointer to GFS2 superblock

 *

 * One of these daemons runs, finding candidates to add to sd_reclaim_list.

 * See gfs2_glockd()

 */



static int gfs2_scand(void *data)

{

	unsigned x;

	unsigned delay;



	while (!kthread_should_stop()) {

		for (x = 0; x < GFS2_GL_HASH_SIZE; x++)

			examine_bucket(scan_glock, NULL, x);

		if (freezing(current))

			refrigerator();

		delay = scand_secs;

		if (delay < 1)

			delay = 1;

		schedule_timeout_interruptible(delay * HZ);

	}



	return 0;

}







int __init gfs2_glock_init(void)

int __init gfs2_glock_init(void)

{

{

	unsigned i;

	unsigned i;
@@ -1984,9 +2004,22 @@ int __init gfs2_glock_init(void) 
		rwlock_init(&gl_hash_locks[i]);

		rwlock_init(&gl_hash_locks[i]);

	}

	}

#endif

#endif



	scand_process = kthread_run(gfs2_scand, NULL, "gfs2_scand");

	if (IS_ERR(scand_process))

		return PTR_ERR(scand_process);



	return 0;

	return 0;

}

}





void gfs2_glock_exit(void)

{

	kthread_stop(scand_process);

}



module_param(scand_secs, uint, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(scand_secs, "The number of seconds between scand runs");



static int gfs2_glock_iter_next(struct glock_iter *gi)

static int gfs2_glock_iter_next(struct glock_iter *gi)

{

{

	struct gfs2_glock *gl;

	struct gfs2_glock *gl;

fs/gfs2/glock.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -132,11 +132,11 @@ void gfs2_glock_cb(void *cb_data, unsigned int type, void *data); 




void gfs2_glock_schedule_for_reclaim(struct gfs2_glock *gl);

void gfs2_glock_schedule_for_reclaim(struct gfs2_glock *gl);

void gfs2_reclaim_glock(struct gfs2_sbd *sdp);

void gfs2_reclaim_glock(struct gfs2_sbd *sdp);



void gfs2_scand_internal(struct gfs2_sbd *sdp);

void gfs2_gl_hash_clear(struct gfs2_sbd *sdp, int wait);

void gfs2_gl_hash_clear(struct gfs2_sbd *sdp, int wait);





int __init gfs2_glock_init(void);

int __init gfs2_glock_init(void);

void gfs2_glock_exit(void);



int gfs2_create_debugfs_file(struct gfs2_sbd *sdp);

int gfs2_create_debugfs_file(struct gfs2_sbd *sdp);

void gfs2_delete_debugfs_file(struct gfs2_sbd *sdp);

void gfs2_delete_debugfs_file(struct gfs2_sbd *sdp);

int gfs2_register_debugfs(void);

int gfs2_register_debugfs(void);

fs/gfs2/incore.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -429,7 +429,6 @@ struct gfs2_tune { 
	unsigned int gt_log_flush_secs;

	unsigned int gt_log_flush_secs;

	unsigned int gt_jindex_refresh_secs; /* Check for new journal index */

	unsigned int gt_jindex_refresh_secs; /* Check for new journal index */





	unsigned int gt_scand_secs;

	unsigned int gt_recoverd_secs;

	unsigned int gt_recoverd_secs;

	unsigned int gt_logd_secs;

	unsigned int gt_logd_secs;

	unsigned int gt_quotad_secs;

	unsigned int gt_quotad_secs;
@@ -574,7 +573,6 @@ struct gfs2_sbd { 




	/* Daemon stuff */

	/* Daemon stuff */





	struct task_struct *sd_scand_process;

	struct task_struct *sd_recoverd_process;

	struct task_struct *sd_recoverd_process;

	struct task_struct *sd_logd_process;

	struct task_struct *sd_logd_process;

	struct task_struct *sd_quotad_process;

	struct task_struct *sd_quotad_process;