lkml.org 
[lkml]   [2006]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patches in this message
    /
    From
    Date
    Subject[PATCH 017 of 19] knfsd: Export nsm_local_state to user space via sysctl

    From: Olaf Kirch <okir@suse.de>

    Every NLM call includes the client's NSM state. Currently,
    the Linux client always reports 0 - which seems not to cause
    any problems, but is not what the protocol says.

    This patch exposes the kernel's internal variable to user
    space via a sysctl, which can be set at system boot time
    by statd.

    Signed-off-by: Olaf Kirch <okir@suse.de>
    Signed-off-by: Neil Brown <neilb@suse.de>

    ### Diffstat output
    ./fs/lockd/mon.c | 2 +-
    ./fs/lockd/svc.c | 9 +++++++++
    ./include/linux/lockd/sm_inter.h | 2 +-
    3 files changed, 11 insertions(+), 2 deletions(-)

    diff .prev/fs/lockd/mon.c ./fs/lockd/mon.c
    --- .prev/fs/lockd/mon.c 2006-09-01 12:11:16.000000000 +1000
    +++ ./fs/lockd/mon.c 2006-09-01 12:17:47.000000000 +1000
    @@ -24,7 +24,7 @@ static struct rpc_program nsm_program;
    /*
    * Local NSM state
    */
    -u32 nsm_local_state;
    +int nsm_local_state;

    /*
    * Common procedure for SM_MON/SM_UNMON calls
    diff .prev/fs/lockd/svc.c ./fs/lockd/svc.c
    --- .prev/fs/lockd/svc.c 2006-09-01 12:15:24.000000000 +1000
    +++ ./fs/lockd/svc.c 2006-09-01 12:19:26.000000000 +1000
    @@ -33,6 +33,7 @@
    #include <linux/sunrpc/svcsock.h>
    #include <net/ip.h>
    #include <linux/lockd/lockd.h>
    +#include <linux/lockd/sm_inter.h>
    #include <linux/nfs.h>

    #define NLMDBG_FACILITY NLMDBG_SVC
    @@ -404,6 +405,14 @@ static ctl_table nlm_sysctls[] = {
    .mode = 0644,
    .proc_handler = &proc_dointvec,
    },
    + {
    + .ctl_name = CTL_UNNUMBERED,
    + .procname = "nsm_local_state",
    + .data = &nsm_local_state,
    + .maxlen = sizeof(int),
    + .mode = 0644,
    + .proc_handler = &proc_dointvec,
    + },
    { .ctl_name = 0 }
    };

    diff .prev/include/linux/lockd/sm_inter.h ./include/linux/lockd/sm_inter.h
    --- .prev/include/linux/lockd/sm_inter.h 2006-09-01 12:11:16.000000000 +1000
    +++ ./include/linux/lockd/sm_inter.h 2006-09-01 12:17:47.000000000 +1000
    @@ -42,6 +42,6 @@ struct nsm_res {

    int nsm_monitor(struct nlm_host *);
    int nsm_unmonitor(struct nlm_host *);
    -extern u32 nsm_local_state;
    +extern int nsm_local_state;

    #endif /* LINUX_LOCKD_SM_INTER_H */
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-09-01 06:43    [W:0.020 / U:58.732 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site