OpenVZ Forum: Devel » [PATCH 00/11] SUNRPC: make sysctl per network namespcase context

Home » Mailing lists » Devel » [PATCH 00/11] SUNRPC: make sysctl per network namespcase context

Show: Today's Messages :: Show Polls :: Message Navigator
E-mail to friend

[PATCH 02/11] SUNRPC: use syctl path instead of dummy parent table [message #44551 is a reply to message #44548]

Wed, 14 December 2011 10:47

Stanislav Kinsbursky is currently offline

Stanislav Kinsbursky
Messages: 683
Registered: October 2011

Senior Member

This is a cleanup patch. Parent sunrpc table is redundant. Syctl path can be
used instead.

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>

---
include/linux/sunrpc/debug.h | 4 ++++
net/sunrpc/sysctl.c | 25 ++++++++++++++-----------
net/sunrpc/xprtrdma/transport.c | 11 +----------
net/sunrpc/xprtsock.c | 11 +----------
4 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h
index c2786f2..b5e0c46 100644
--- a/include/linux/sunrpc/debug.h
+++ b/include/linux/sunrpc/debug.h
@@ -63,8 +63,12 @@ extern unsigned int nlm_debug;
* Sysctl interface for RPC debugging
*/
#ifdef RPC_DEBUG
+
void rpc_register_sysctl(void);
void rpc_unregister_sysctl(void);
+
+struct ctl_table_header *register_sunrpc_sysctl(struct ctl_table *);
+
#endif

#endif /* __KERNEL__ */
diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c
index af7d339..64c0034 100644
--- a/net/sunrpc/sysctl.c
+++ b/net/sunrpc/sysctl.c
@@ -40,13 +40,25 @@ EXPORT_SYMBOL_GPL(nlm_debug);
#ifdef RPC_DEBUG

static struct ctl_table_header *sunrpc_table_header;
-static ctl_table sunrpc_table[];
+static ctl_table debug_table[];
+
+struct ctl_path sunrpc_path[] = {
+ { .procname = "sunrpc", },
+ { },
+};
+
+struct ctl_table_header *register_sunrpc_sysctl(struct ctl_table *table)
+{
+ return register_sysctl_paths(sunrpc_path, table);
+
+}
+EXPORT_SYMBOL_GPL(register_sunrpc_sysctl);

void
rpc_register_sysctl(void)
{
if (!sunrpc_table_header)
- sunrpc_table_header = register_sysctl_table(sunrpc_table);
+ sunrpc_table_header = register_sunrpc_sysctl(debug_table);
}

void
@@ -173,13 +185,4 @@ static ctl_table debug_table[] = {
{ }
};

-static ctl_table sunrpc_table[] = {
- {
- .procname = "sunrpc",
- .mode = 0555,
- .child = debug_table
- },
- { }
-};
-
#endif
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index b446e10..53a8622 100644
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -137,15 +137,6 @@ static ctl_table xr_tunables_table[] = {
{ },
};

-static ctl_table sunrpc_table[] = {
- {
- .procname = "sunrpc",
- .mode = 0555,
- .child = xr_tunables_table
- },
- { },
-};
-
#endif

static struct rpc_xprt_ops xprt_rdma_procs; /* forward reference */
@@ -771,7 +762,7 @@ static int __init xprt_rdma_init(void)

#ifdef RPC_DEBUG
if (!sunrpc_table_header)
- sunrpc_table_header = register_sysctl_table(sunrpc_table);
+ sunrpc_table_header = register_sunrpc_sysctl(xr_tunables_table);
#endif
return 0;
}
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 55472c4..6f1be96 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -142,15 +142,6 @@ static ctl_table xs_tunables_table[] = {
{ },
};

-static ctl_table sunrpc_table[] = {
- {
- .procname = "sunrpc",
- .mode = 0555,
- .child = xs_tunables_table
- },
- { },
-};
-
#endif

/*
@@ -2887,7 +2878,7 @@ int init_socket_xprt(void)
{
#ifdef RPC_DEBUG
if (!sunrpc_table_header)
- sunrpc_table_header = register_sysctl_table(sunrpc_table);
+ sunrpc_table_header = register_sunrpc_sysctl(xs_tunables_table);
#endif

xprt_register_transport(&xs_local_transport);

Report message to a moderator

[Message index]

		[PATCH 00/11] SUNRPC: make sysctl per network namespcase context By: Stanislav Kinsbursky on Wed, 14 December 2011 10:45
		[PATCH 11/11] SUNRPC: sysctl table for rpc_debug introduced By: Stanislav Kinsbursky on Wed, 14 December 2011 10:47
		[PATCH 01/11] SYSCTL: export root and set handling routines By: Stanislav Kinsbursky on Wed, 14 December 2011 10:47
		Re: [PATCH 01/11] SYSCTL: export root and set handling routines By: ebiederm on Sat, 17 December 2011 22:25
		Re: [PATCH 01/11] SYSCTL: export root and set handling routines By: Stanislav Kinsbursky on Mon, 19 December 2011 08:56
		Re: [PATCH 01/11] SYSCTL: export root and set handling routines By: ebiederm on Mon, 19 December 2011 10:14
		Re: [PATCH 01/11] SYSCTL: export root and set handling routines By: Stanislav Kinsbursky on Mon, 19 December 2011 12:22
		Re: [PATCH 01/11] SYSCTL: export root and set handling routines By: ebiederm on Mon, 19 December 2011 16:37
		Re: [PATCH 01/11] SYSCTL: export root and set handling routines By: Stanislav Kinsbursky on Mon, 19 December 2011 17:24
		Re: [PATCH 01/11] SYSCTL: export root and set handling routines By: ebiederm on Tue, 03 January 2012 03:48
		Re: [PATCH 01/11] SYSCTL: export root and set handling routines By: Stanislav Kinsbursky on Tue, 10 January 2012 10:38
		Re: [PATCH 01/11] SYSCTL: export root and set handling routines By: ebiederm on Tue, 10 January 2012 22:38
		Re: [PATCH 01/11] SYSCTL: export root and set handling routines By: Stanislav Kinsbursky on Wed, 11 January 2012 09:47
		Re: [PATCH 01/11] SYSCTL: export root and set handling routines By: ebiederm on Wed, 11 January 2012 17:20
		Re: [PATCH 01/11] SYSCTL: export root and set handling routines By: Stanislav Kinsbursky on Wed, 11 January 2012 18:02
		Re: [PATCH 01/11] SYSCTL: export root and set handling routines By: ebiederm on Wed, 11 January 2012 19:34
		Re: [PATCH 01/11] SYSCTL: export root and set handling routines By: Stanislav Kinsbursky on Thu, 12 January 2012 09:17
		[PATCH 02/11] SUNRPC: use syctl path instead of dummy parent table By: Stanislav Kinsbursky on Wed, 14 December 2011 10:47
		[PATCH 03/11] SUNRPC: sysctl root for debug table introduced By: Stanislav Kinsbursky on Wed, 14 December 2011 10:47
		[PATCH 05/11] SUNRPC: register debug sysctl table per network namespace By: Stanislav Kinsbursky on Wed, 14 December 2011 10:47
		[PATCH 04/11] SUNRPC: per-net sysctl's set introduced By: Stanislav Kinsbursky on Wed, 14 December 2011 10:47
		[PATCH 06/11] SUNRPC: register xs_tunables sysctl table per network namespace By: Stanislav Kinsbursky on Wed, 14 December 2011 10:47
		[PATCH 07/11] SUNRPC: xs tunables per network namespace introduced By: Stanislav Kinsbursky on Wed, 14 December 2011 10:47
		[PATCH 09/11] SUNRPC: remove xs_tcp_fin_timeout variable By: Stanislav Kinsbursky on Wed, 14 December 2011 10:47
		[PATCH 10/11] SUNRPC: allow debug flags modifications only from init_net By: Stanislav Kinsbursky on Wed, 14 December 2011 10:47
		[PATCH 08/11] SUNRPC: use per-net xs tunables instead of static ones By: Stanislav Kinsbursky on Wed, 14 December 2011 10:47
		Re: [PATCH 00/11] SUNRPC: make sysctl per network namespcase context By: Stanislav Kinsbursky on Tue, 07 February 2012 11:44
		Re: [PATCH 00/11] SUNRPC: make sysctl per network namespcase context By: Myklebust, Trond on Tue, 07 February 2012 13:21

Previous Topic:	[PATCH 1/5] make steal time's to-tick routine generic
Next Topic:	[PATCH 4/4] NFS: make nfs_client_lock per net ns

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

] [

]

Current Time: Mon Jul 21 04:18:38 GMT 2025

Total time taken to generate the page: 0.28751 seconds