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

Commit 700815d4 authored by Dmitry Eremin's avatar Dmitry Eremin Committed by Greg Kroah-Hartman
Browse files

staging/lustre/ldlm: move all remaining files from procfs to debugfs 



Move all files except stats. It will be moved later after change
type of obddev->obd_proc_entry member.

Signed-off-by: default avatarDmitry Eremin <dmiter4ever@gmail.com>
Signed-off-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b40881e5

drivers/staging/lustre/lustre/include/lustre_dlm.h

+6 −11
Original line number Diff line number Diff line
@@ -234,8 +234,8 @@ struct ldlm_pool_ops { 
 * This feature is commonly referred to as lru_resize.

 */

struct ldlm_pool {

	/** Pool proc directory. */

	struct proc_dir_entry	*pl_proc_dir;

	/** Pool debugfs directory. */

	struct dentry		*pl_debugfs_entry;

	/** Pool name, must be long enough to hold compound proc entry name. */

	char			pl_name[100];

	/** Lock for protecting SLV/CLV updates. */
@@ -388,8 +388,8 @@ struct ldlm_namespace { 
	/** Client side original connect flags supported by server. */

	__u64			ns_orig_connect_flags;



	/* namespace proc dir entry */

	struct proc_dir_entry	*ns_proc_dir_entry;

	/* namespace debugfs dir entry */

	struct dentry		*ns_debugfs_entry;



	/**

	 * Position in global namespace list linking all namespaces on
@@ -1251,13 +1251,8 @@ void ldlm_namespace_register(struct ldlm_namespace *ns, ldlm_side_t client); 
void ldlm_namespace_unregister(struct ldlm_namespace *ns, ldlm_side_t client);

void ldlm_namespace_get(struct ldlm_namespace *ns);

void ldlm_namespace_put(struct ldlm_namespace *ns);

#if defined (CONFIG_PROC_FS)

int ldlm_proc_setup(void);

void ldlm_proc_cleanup(void);

#else

static inline int ldlm_proc_setup(void) { return 0; }

static inline void ldlm_proc_cleanup(void) {}

#endif

int ldlm_debugfs_setup(void);

void ldlm_debugfs_cleanup(void);



/* resource.c - internal */

struct ldlm_resource *ldlm_resource_get(struct ldlm_namespace *ns,

drivers/staging/lustre/lustre/include/lustre_net.h

+3 −3
Original line number Diff line number Diff line
@@ -1978,8 +1978,8 @@ struct ptlrpc_service { 
	int				srv_nthrs_cpt_init;

	/** limit of threads number for each partition */

	int				srv_nthrs_cpt_limit;

	/** Root of /proc dir tree for this service */

	struct proc_dir_entry	   *srv_procroot;

	/** Root of debugfs dir tree for this service */

	struct dentry		   *srv_debugfs_entry;

	/** Pointer to statistic data for this service */

	struct lprocfs_stats	   *srv_stats;

	/** # hp per lp reqs to handle */
@@ -2530,7 +2530,7 @@ int ptlrpc_hpreq_handler(struct ptlrpc_request *req); 
struct ptlrpc_service *ptlrpc_register_service(

				struct ptlrpc_service_conf *conf,

				struct kset *parent,

				struct proc_dir_entry *proc_entry);

				struct dentry *debugfs_entry);

void ptlrpc_stop_all_threads(struct ptlrpc_service *svc);



int ptlrpc_start_threads(struct ptlrpc_service *svc);

drivers/staging/lustre/lustre/ldlm/ldlm_internal.h

+1 −2
Original line number Diff line number Diff line
@@ -197,8 +197,7 @@ void ldlm_destroy_flock_export(struct obd_export *exp); 
void l_check_ns_lock(struct ldlm_namespace *ns);

void l_check_no_ns_lock(struct ldlm_namespace *ns);



extern struct proc_dir_entry *ldlm_svc_proc_dir;

extern struct proc_dir_entry *ldlm_type_proc_dir;

extern struct dentry *ldlm_svc_debugfs_dir;



struct ldlm_state {

	struct ptlrpc_service *ldlm_cb_service;

drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c

+3 −4
Original line number Diff line number Diff line
@@ -1078,7 +1078,7 @@ static int ldlm_setup(void) 
		goto out;

	}



	rc = ldlm_proc_setup();

	rc = ldlm_debugfs_setup();

	if (rc != 0)

		goto out;
@@ -1113,7 +1113,7 @@ static int ldlm_setup(void) 
	};

	ldlm_state->ldlm_cb_service =

			ptlrpc_register_service(&conf, ldlm_svc_kset,

						ldlm_svc_proc_dir);

						ldlm_svc_debugfs_dir);

	if (IS_ERR(ldlm_state->ldlm_cb_service)) {

		CERROR("failed to start service\n");

		rc = PTR_ERR(ldlm_state->ldlm_cb_service);
@@ -1204,8 +1204,7 @@ static int ldlm_cleanup(void) 
	if (ldlm_kobj)

		kobject_put(ldlm_kobj);



	ldlm_proc_cleanup();



	ldlm_debugfs_cleanup();



	kfree(ldlm_state);

	ldlm_state = NULL;

drivers/staging/lustre/lustre/ldlm/ldlm_pool.c

+21 −29
Original line number Diff line number Diff line
@@ -654,7 +654,6 @@ int ldlm_pool_setup(struct ldlm_pool *pl, int limit) 
}

EXPORT_SYMBOL(ldlm_pool_setup);



#if defined(CONFIG_PROC_FS)

static int lprocfs_pool_state_seq_show(struct seq_file *m, void *unused)

{

	int granted, grant_rate, cancel_rate, grant_step;
@@ -745,7 +744,7 @@ LUSTRE_RW_ATTR(lock_volume_factor); 
		snprintf(var_name, MAX_STRING_SIZE, #name);	\

		pool_vars[0].data = var;			\

		pool_vars[0].fops = ops;			\

		lprocfs_add_vars(pl->pl_proc_dir, pool_vars, NULL);\

		ldebugfs_add_vars(pl->pl_debugfs_entry, pool_vars, NULL);\

	} while (0)



/* These are for pools in /sys/fs/lustre/ldlm/namespaces/.../pool */
@@ -787,10 +786,10 @@ static int ldlm_pool_sysfs_init(struct ldlm_pool *pl) 
	return err;

}



static int ldlm_pool_proc_init(struct ldlm_pool *pl)

static int ldlm_pool_debugfs_init(struct ldlm_pool *pl)

{

	struct ldlm_namespace *ns = ldlm_pl2ns(pl);

	struct proc_dir_entry *parent_ns_proc;

	struct dentry *debugfs_ns_parent;

	struct lprocfs_vars pool_vars[2];

	char *var_name = NULL;

	int rc = 0;
@@ -799,19 +798,19 @@ static int ldlm_pool_proc_init(struct ldlm_pool *pl) 
	if (!var_name)

		return -ENOMEM;



	parent_ns_proc = ns->ns_proc_dir_entry;

	if (parent_ns_proc == NULL) {

		CERROR("%s: proc entry is not initialized\n",

	debugfs_ns_parent = ns->ns_debugfs_entry;

	if (IS_ERR_OR_NULL(debugfs_ns_parent)) {

		CERROR("%s: debugfs entry is not initialized\n",

		       ldlm_ns_name(ns));

		rc = -EINVAL;

		goto out_free_name;

	}

	pl->pl_proc_dir = lprocfs_register("pool", parent_ns_proc,

	pl->pl_debugfs_entry = ldebugfs_register("pool", debugfs_ns_parent,

						 NULL, NULL);

	if (IS_ERR(pl->pl_proc_dir)) {

		CERROR("LProcFS failed in ldlm-pool-init\n");

		rc = PTR_ERR(pl->pl_proc_dir);

		pl->pl_proc_dir = NULL;

	if (IS_ERR(pl->pl_debugfs_entry)) {

		CERROR("LdebugFS failed in ldlm-pool-init\n");

		rc = PTR_ERR(pl->pl_debugfs_entry);

		pl->pl_debugfs_entry = NULL;

		goto out_free_name;

	}
@@ -819,7 +818,7 @@ static int ldlm_pool_proc_init(struct ldlm_pool *pl) 
	memset(pool_vars, 0, sizeof(pool_vars));

	pool_vars[0].name = var_name;



	LDLM_POOL_ADD_VAR("state", pl, &lprocfs_pool_state_fops);

	LDLM_POOL_ADD_VAR(state, pl, &lprocfs_pool_state_fops);



	pl->pl_stats = lprocfs_alloc_stats(LDLM_POOL_LAST_STAT -

					   LDLM_POOL_FIRST_STAT, 0);
@@ -861,7 +860,8 @@ static int ldlm_pool_proc_init(struct ldlm_pool *pl) 
	lprocfs_counter_init(pl->pl_stats, LDLM_POOL_TIMING_STAT,

			     LPROCFS_CNTR_AVGMINMAX | LPROCFS_CNTR_STDDEV,

			     "recalc_timing", "sec");

	rc = lprocfs_register_stats(pl->pl_proc_dir, "stats", pl->pl_stats);

	rc = ldebugfs_register_stats(pl->pl_debugfs_entry, "stats",

				     pl->pl_stats);



out_free_name:

	kfree(var_name);
@@ -874,25 +874,17 @@ static void ldlm_pool_sysfs_fini(struct ldlm_pool *pl) 
	wait_for_completion(&pl->pl_kobj_unregister);

}



static void ldlm_pool_proc_fini(struct ldlm_pool *pl)

static void ldlm_pool_debugfs_fini(struct ldlm_pool *pl)

{

	if (pl->pl_stats != NULL) {

		lprocfs_free_stats(&pl->pl_stats);

		pl->pl_stats = NULL;

	}

	if (pl->pl_proc_dir != NULL) {

		lprocfs_remove(&pl->pl_proc_dir);

		pl->pl_proc_dir = NULL;

	if (pl->pl_debugfs_entry != NULL) {

		ldebugfs_remove(&pl->pl_debugfs_entry);

		pl->pl_debugfs_entry = NULL;

	}

}

#else /* !CONFIG_PROC_FS */

static int ldlm_pool_proc_init(struct ldlm_pool *pl)

{

	return 0;

}



static void ldlm_pool_proc_fini(struct ldlm_pool *pl) {}

#endif /* CONFIG_PROC_FS */



int ldlm_pool_init(struct ldlm_pool *pl, struct ldlm_namespace *ns,

		   int idx, ldlm_side_t client)
@@ -923,7 +915,7 @@ int ldlm_pool_init(struct ldlm_pool *pl, struct ldlm_namespace *ns, 
		pl->pl_recalc_period = LDLM_POOL_CLI_DEF_RECALC_PERIOD;

	}

	pl->pl_client_lock_volume = 0;

	rc = ldlm_pool_proc_init(pl);

	rc = ldlm_pool_debugfs_init(pl);

	if (rc)

		return rc;
@@ -940,7 +932,7 @@ EXPORT_SYMBOL(ldlm_pool_init); 
void ldlm_pool_fini(struct ldlm_pool *pl)

{

	ldlm_pool_sysfs_fini(pl);

	ldlm_pool_proc_fini(pl);

	ldlm_pool_debugfs_fini(pl);



	/*

	 * Pool should not be used after this point. We can't free it here as