lkml.org 
[lkml]   [2011]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 02/11] SUNRPC: use syctl path instead of dummy parent table
    From
    Date
    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);


    \
     
     \ /
      Last update: 2011-12-14 11:47    [W:4.019 / U:0.340 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site