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

Commit 77386b3c authored by Dmitry Eremin's avatar Dmitry Eremin Committed by Greg Kroah-Hartman
Browse files

staging/lustre/ptlrpc: move sptlrpc procfs entry to debugfs 



We might want eventuall split it into a bunch of
single-value sysfs entries, I imagine, but there is no urgent need now.

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 700815d4

drivers/staging/lustre/lustre/include/lustre_sec.h

+0 −8
Original line number Diff line number Diff line
@@ -1061,15 +1061,7 @@ const char *sec2target_str(struct ptlrpc_sec *sec); 
/*

 * lprocfs

 */

#if defined (CONFIG_PROC_FS)

struct proc_dir_entry;

extern struct proc_dir_entry *sptlrpc_proc_root;

int sptlrpc_lprocfs_cliobd_attach(struct obd_device *dev);

#else

#define sptlrpc_proc_root	NULL

static inline int sptlrpc_lprocfs_cliobd_attach(struct obd_device *dev)

{ return 0; }

#endif



/*

 * server side

drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c

+12 −15
Original line number Diff line number Diff line
@@ -51,10 +51,6 @@ 


#include "ptlrpc_internal.h"





struct proc_dir_entry *sptlrpc_proc_root = NULL;

EXPORT_SYMBOL(sptlrpc_proc_root);



static char *sec_flags2str(unsigned long flags, char *buf, int bufsize)

{

	buf[0] = '\0';
@@ -174,17 +170,20 @@ static struct lprocfs_vars sptlrpc_lprocfs_vars[] = { 
	{ NULL }

};



static struct dentry *sptlrpc_debugfs_dir;



int sptlrpc_lproc_init(void)

{

	int rc;



	LASSERT(sptlrpc_proc_root == NULL);

	LASSERT(sptlrpc_debugfs_dir == NULL);



	sptlrpc_proc_root = lprocfs_register("sptlrpc", proc_lustre_root,

	sptlrpc_debugfs_dir = ldebugfs_register("sptlrpc", debugfs_lustre_root,

						sptlrpc_lprocfs_vars, NULL);

	if (IS_ERR(sptlrpc_proc_root)) {

		rc = PTR_ERR(sptlrpc_proc_root);

		sptlrpc_proc_root = NULL;

	if (IS_ERR_OR_NULL(sptlrpc_debugfs_dir)) {

		rc = sptlrpc_debugfs_dir ? PTR_ERR(sptlrpc_debugfs_dir)

					 : -ENOMEM;

		sptlrpc_debugfs_dir = NULL;

		return rc;

	}

	return 0;
@@ -192,8 +191,6 @@ int sptlrpc_lproc_init(void) 


void sptlrpc_lproc_fini(void)

{

	if (sptlrpc_proc_root) {

		lprocfs_remove(&sptlrpc_proc_root);

		sptlrpc_proc_root = NULL;

	}

	if (!IS_ERR_OR_NULL(sptlrpc_debugfs_dir))

		ldebugfs_remove(&sptlrpc_debugfs_dir);

}