mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 02:00:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Dmitry Eremin <dmiter4ever@gmail.com>
Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dmitry Eremin
2015-05-21 15:32:12 -04:00
committed by Greg Kroah-Hartman
parent 700815d47f
commit 77386b3c0b
2 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/lustre/lustre/include/lustre_sec.h
View File

@@ -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

27
drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c
View File

@@ -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;
int rc;
LASSERT(sptlrpc_proc_root == NULL);
LASSERT(sptlrpc_debugfs_dir == NULL);
sptlrpc_proc_root = lprocfs_register("sptlrpc", proc_lustre_root,
sptlrpc_lprocfs_vars, NULL);
if (IS_ERR(sptlrpc_proc_root)) {
rc = PTR_ERR(sptlrpc_proc_root);
sptlrpc_proc_root = NULL;
sptlrpc_debugfs_dir = ldebugfs_register("sptlrpc", debugfs_lustre_root,
sptlrpc_lprocfs_vars, 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);
}