mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-06 11:26:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: lustre: make lnet_debugfs_symlink_def local to libcfs/modules.c

Browse Source 
This type is only used in libcfs/module.c, so make it local to there.
If any other module ever wanted to add its own symlinks,
it would probably be easiest to export lnet_debugfs_root
and just call debugfs_create_symlink as required.

Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
NeilBrown
2018-05-21 14:35:12 +10:00
committed by Greg Kroah-Hartman
parent 1c36b6de6a
commit c4f9077197
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/lustre/include/linux/libcfs/libcfs.h
View File

@@ -110,13 +110,7 @@ extern char lnet_debug_log_upcall[1024];
extern struct workqueue_struct *cfs_rehash_wq;
struct lnet_debugfs_symlink_def {
char *name;
char *target;
};
void lustre_insert_debugfs(struct ctl_table *table,
const struct lnet_debugfs_symlink_def *symlinks);
void lustre_insert_debugfs(struct ctl_table *table);
int lprocfs_call_handler(void *data, int write, loff_t *ppos,
void __user *buffer, size_t *lenp,
int (*handler)(void *data, int write, loff_t pos,

23
drivers/staging/lustre/lnet/libcfs/module.c
View File

@@ -60,6 +60,11 @@
#include <uapi/linux/lnet/lnet-dlc.h>
#include "tracefile.h"
struct lnet_debugfs_symlink_def {
char *name;
char *target;
};
static struct dentry *lnet_debugfs_root;
BLOCKING_NOTIFIER_HEAD(libcfs_ioctl_list);
@@ -620,8 +625,7 @@ static const struct file_operations *lnet_debugfs_fops_select(umode_t mode)
return &lnet_debugfs_file_operations_rw;
}
void lustre_insert_debugfs(struct ctl_table *table,
const struct lnet_debugfs_symlink_def *symlinks)
void lustre_insert_debugfs(struct ctl_table *table)
{
if (!lnet_debugfs_root)
lnet_debugfs_root = debugfs_create_dir("lnet", NULL);
@@ -630,19 +634,24 @@ void lustre_insert_debugfs(struct ctl_table *table,
if (IS_ERR_OR_NULL(lnet_debugfs_root))
return;
/* We don't save the dentry returned in next two calls, because
* we don't call debugfs_remove() but rather remove_recursive()
/*
* We don't save the dentry returned because we don't call
* debugfs_remove() but rather remove_recursive()
*/
for (; table->procname; table++)
debugfs_create_file(table->procname, table->mode,
lnet_debugfs_root, table,
lnet_debugfs_fops_select(table->mode));
}
EXPORT_SYMBOL_GPL(lustre_insert_debugfs);
static void lustre_insert_debugfs_links(
const struct lnet_debugfs_symlink_def *symlinks)
{
for (; symlinks && symlinks->name; symlinks++)
debugfs_create_symlink(symlinks->name, lnet_debugfs_root,
symlinks->target);
}
EXPORT_SYMBOL_GPL(lustre_insert_debugfs);
static void lustre_remove_debugfs(void)
{
@@ -688,7 +697,9 @@ int libcfs_setup(void)
goto err;
}
lustre_insert_debugfs(lnet_table, lnet_debugfs_symlinks);
lustre_insert_debugfs(lnet_table);
if (!IS_ERR_OR_NULL(lnet_debugfs_root))
lustre_insert_debugfs_links(lnet_debugfs_symlinks);
CDEBUG(D_OTHER, "portals setup OK\n");
out:

2
drivers/staging/lustre/lnet/lnet/router_proc.c
View File

@@ -900,7 +900,7 @@ static struct ctl_table lnet_table[] = {
void lnet_router_debugfs_init(void)
{
lustre_insert_debugfs(lnet_table, NULL);
lustre_insert_debugfs(lnet_table);
}
void lnet_router_debugfs_fini(void)