leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: lustre: make LNet use lprocfs_call_handler

Browse Source 
Sometime ago a patch was submitted to duplicate the
proc_call_handler code in the LNet layer. This was
due to the thinking libcfs was not used by the LNet
layer. This was a wrong assumption so lets make LNet
use the lprocfs_call_handler from the libcfs layer.

Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
James Simmons 2016-03-07 18:10:24 -05:00 committed by Greg Kroah-Hartman
parent 5900ba932e
commit 708a24c189
3 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,5 +154,9 @@ struct lnet_debugfs_symlink_def {
void lustre_insert_debugfs(struct ctl_table *table,
const struct lnet_debugfs_symlink_def *symlinks);
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, void __user *buffer, int len));
#endif /* _LIBCFS_H */

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

@ -73,26 +73,6 @@
#define LNET_PROC_VERSION(v) ((unsigned int)((v) & LNET_PROC_VER_MASK))
static int proc_call_handler(void *data, int write, loff_t *ppos,
void __user *buffer, size_t *lenp,
int (*handler)(void *data, int write,
loff_t pos, void __user *buffer,
int len))
{
int rc = handler(data, write, *ppos, buffer, *lenp);
if (rc < 0)
return rc;
if (write) {
*ppos += *lenp;
} else {
*lenp = rc;
*ppos += rc;
}
return 0;
}
static int __proc_lnet_stats(void *data, int write,
loff_t pos, void __user *buffer, int nob)
{
@ -144,8 +124,8 @@ static int __proc_lnet_stats(void *data, int write,
static int proc_lnet_stats(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
return proc_call_handler(table->data, write, ppos, buffer, lenp,
__proc_lnet_stats);
return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
__proc_lnet_stats);
}
static int proc_lnet_routes(struct ctl_table *table, int write,
@ -640,8 +620,8 @@ static int __proc_lnet_buffers(void *data, int write,
static int proc_lnet_buffers(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
return proc_call_handler(table->data, write, ppos, buffer, lenp,
__proc_lnet_buffers);
return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
__proc_lnet_buffers);
}
static int proc_lnet_nis(struct ctl_table *table, int write,
@ -865,8 +845,8 @@ static int proc_lnet_portal_rotor(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp,
loff_t *ppos)
{
return proc_call_handler(table->data, write, ppos, buffer, lenp,
__proc_lnet_portal_rotor);
return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
__proc_lnet_portal_rotor);
}
static struct ctl_table lnet_table[] = {

9
drivers/staging/lustre/lustre/libcfs/module.c
View File

@ -217,10 +217,10 @@ struct cfs_psdev_ops libcfs_psdev_ops = {
libcfs_ioctl
};
static 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,
void __user *buffer, int len))
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,
void __user *buffer, int len))
{
int rc = handler(data, write, *ppos, buffer, *lenp);
@ -235,6 +235,7 @@ static int lprocfs_call_handler(void *data, int write, loff_t *ppos,
}
return 0;
}
EXPORT_SYMBOL(lprocfs_call_handler);
static int __proc_dobitmasks(void *data, int write,
loff_t pos, void __user *buffer, int nob)