lkml.org 
[lkml]   [2011]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 22/69] sysctl: remove .child from fs/nfs/ nlm_table table
    Date
    Signed-off-by: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
    ---
    fs/lockd/svc.c | 22 +++++-----------------
    1 files changed, 5 insertions(+), 17 deletions(-)

    diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
    index abfff9d..6ab5932 100644
    --- a/fs/lockd/svc.c
    +++ b/fs/lockd/svc.c
    @@ -355,7 +355,7 @@ EXPORT_SYMBOL_GPL(lockd_down);
    * Sysctl parameters (same as module parameters, different interface).
    */

    -static ctl_table nlm_sysctls[] = {
    +static ctl_table nlm_table[] = {
    {
    .procname = "nlm_grace_period",
    .data = &nlm_grace_period,
    @@ -409,21 +409,9 @@ static ctl_table nlm_sysctls[] = {
    { }
    };

    -static ctl_table nlm_sysctl_dir[] = {
    - {
    - .procname = "nfs",
    - .mode = 0555,
    - .child = nlm_sysctls,
    - },
    - { }
    -};
    -
    -static ctl_table nlm_sysctl_root[] = {
    - {
    - .procname = "fs",
    - .mode = 0555,
    - .child = nlm_sysctl_dir,
    - },
    +static const __initdata struct ctl_path nlm_path[] = {
    + { .procname = "fs" },
    + { .procname = "nfs" },
    { }
    };

    @@ -504,7 +492,7 @@ module_param(nlm_max_connections, uint, 0644);
    static int __init init_nlm(void)
    {
    #ifdef CONFIG_SYSCTL
    - nlm_sysctl_table = register_sysctl_table(nlm_sysctl_root);
    + nlm_sysctl_table = register_sysctl_paths(nlm_path, nlm_table);
    return nlm_sysctl_table ? 0 : -ENOMEM;
    #else
    return 0;
    --
    1.7.5.134.g1c08b


    \
     
     \ /
      Last update: 2011-05-01 04:05    [W:0.027 / U:92.040 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site