Construct the "priv" cookie when the nsm_handle is created, and pass
that to SM_MON's XDR encoder, instead of creating the "priv" cookie
in the encoder at call time.
This patch should not cause a behavioral change: the contents of the
cookie remain the same for the time being.
Collect NSM XDR data type definitions in the same header as NLM XDR
data type definitions, since lockd uses NSM XDR data types too. The
nlm_reboot data structure, for example, is used in both lockd and in
the NSM implementation. The new definition of nsm_private is placed
in xdr.h, and the definition of SM_PRIV_SIZE is placed next to it.
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
---
fs/lockd/mon.c | 29 ++++++++++++++++++-----------
include/linux/lockd/lockd.h | 1 +
include/linux/lockd/sm_inter.h | 1 -
include/linux/lockd/xdr.h | 6 ++++++
4 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 6f3a54e..a4d2b9e 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -36,7 +36,7 @@ static struct rpc_clnt * nsm_create(void);
static struct rpc_program nsm_program;
struct nsm_args {
- __be32 addr; /* remote address */
+ struct nsm_private *priv;
u32 prog; /* RPC callback info */
u32 vers;
u32 proc;
@@ -66,7 +66,7 @@ nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res)
struct rpc_clnt *clnt;
int status;
struct nsm_args args = {
- .addr = nsm_addr_in(nsm)->sin_addr.s_addr,
+ .priv = &nsm->sm_priv,
.prog = NLM_PROGRAM,
.vers = 3,
.proc = NLMPROC_NSM_NOTIFY,
@@ -101,6 +101,20 @@ nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res)
return status;
}
+/*
+ * Construct a unique cookie to identify this nsm_handle. It is
+ * passed to our statd via SM_MON, and returned via NLM_SM_NOTIFY,
+ * in the "priv" field of these requests.
+ *
+ * Linux provides the raw IP address of the monitored host,
+ * left in network byte order.
+ */
+static void nsm_init_private(struct nsm_handle *nsm)
+{
+ __be32 *p = (__be32 *)&nsm->sm_priv.data;
+ *p = nsm_addr_in(nsm)->sin_addr.s_addr;
+}
+
/**
* nsm_find - Find a cached nsm_handle by name or address
* @sap: pointer to socket address of handle to find
@@ -162,6 +176,7 @@ retry:
nsm->sm_name = (char *) (nsm + 1);
memcpy(nsm->sm_name, hostname, hostname_len);
nsm->sm_name[hostname_len] = '\0';
+ nsm_init_private(nsm);
nlm_display_address((struct sockaddr *)&nsm->sm_addr,
nsm->sm_addrbuf, sizeof(nsm->sm_addrbuf));
atomic_set(&nsm->sm_count, 1);
@@ -326,18 +341,10 @@ static __be32 *xdr_encode_mon_id(__be32 *p, struct nsm_args *argp)
* The "priv" argument may contain private information required
* by the SM_MON call. This information will be supplied in the
* NLM_SM_NOTIFY call.
- *
- * Linux provides the raw IP address of the monitored host,
- * left in network byte order.
*/
static __be32 *xdr_encode_priv(__be32 *p, struct nsm_args *argp)
{
- *p++ = argp->addr;
- *p++ = 0;
- *p++ = 0;
- *p++ = 0;
-
- return p;
+ return xdr_encode_opaque(p, argp->priv->data, sizeof(argp->priv->data));
}
static int
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index 6dc1043..20a56e9 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -82,6 +82,7 @@ struct nsm_handle {
size_t sm_addrlen;
unsigned int sm_monitored : 1,
sm_sticky : 1; /* don't unmonitor */
+ struct nsm_private sm_priv;
char sm_addrbuf[LOCKD_ADDRBUF];
};
diff --git a/include/linux/lockd/sm_inter.h b/include/linux/lockd/sm_inter.h
index da72872..7f22d6f 100644
--- a/include/linux/lockd/sm_inter.h
+++ b/include/linux/lockd/sm_inter.h
@@ -10,6 +10,5 @@
#define LINUX_LOCKD_SM_INTER_H
#define SM_MAXSTRLEN 1024
-#define SM_PRIV_SIZE 16
#endif /* LINUX_LOCKD_SM_INTER_H */
diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h
index d6b3a80..6b51992 100644
--- a/include/linux/lockd/xdr.h
+++ b/include/linux/lockd/xdr.h
@@ -13,6 +13,12 @@
#include <linux/nfs.h>
#include <linux/sunrpc/xdr.h>
+#define SM_PRIV_SIZE 16
+
+struct nsm_private {
+ unsigned char data[SM_PRIV_SIZE];
+};
+
struct svc_rqst;
#define NLM_MAXCOOKIELEN 32
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
