The patch titled
knfsd: export nsm_local_state to user space via sysctl
has been removed from the -mm tree. Its filename is
knfsd-export-nsm_local_state-to-user-space-via-sysctl.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: knfsd: export nsm_local_state to user space via sysctl
From: Olaf Kirch <okir@xxxxxxx>
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@xxxxxxx>
Signed-off-by: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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 -puN fs/lockd/mon.c~knfsd-export-nsm_local_state-to-user-space-via-sysctl fs/lockd/mon.c
--- a/fs/lockd/mon.c~knfsd-export-nsm_local_state-to-user-space-via-sysctl
+++ a/fs/lockd/mon.c
@@ -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 -puN fs/lockd/svc.c~knfsd-export-nsm_local_state-to-user-space-via-sysctl fs/lockd/svc.c
--- a/fs/lockd/svc.c~knfsd-export-nsm_local_state-to-user-space-via-sysctl
+++ a/fs/lockd/svc.c
@@ -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 -puN include/linux/lockd/sm_inter.h~knfsd-export-nsm_local_state-to-user-space-via-sysctl include/linux/lockd/sm_inter.h
--- a/include/linux/lockd/sm_inter.h~knfsd-export-nsm_local_state-to-user-space-via-sysctl
+++ a/include/linux/lockd/sm_inter.h
@@ -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 */
_
Patches currently in -mm which might be from okir@xxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
