NLM: Decode "priv" argument of NLMPROC_SM_NOTIFY as an opaque

[deliverable/linux.git] / include / linux / lockd / xdr.h

diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h
index 29e7d9fc9dad68c163c38a6908659540869d0bb4..6338866222a8fd1b4797058cf22251d718bedd34 100644 (file)
--- 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
@@ -29,7 +35,7 @@ struct svc_rqst;
 /* Lock info passed via NLM */
 struct nlm_lock {
        char *                  caller;
-       int                     len;    /* length of "caller" */
+       unsigned int            len;    /* length of "caller" */
        struct nfs_fh           fh;
        struct xdr_netobj       oh;
        u32                     svid;
@@ -69,7 +75,7 @@ typedef struct nlm_args nlm_args;
  */
 struct nlm_res {
        struct nlm_cookie       cookie;
-       u32                     status;
+       __be32                  status;
        struct nlm_lock         lock;
 };
 
@@ -77,12 +83,10 @@ struct nlm_res {
  * statd callback when client has rebooted
  */
 struct nlm_reboot {
-       char *          mon;
-       int             len;
-       u32             state;
-       u32             addr;
-       u32             vers;
-       u32             proto;
+       char                    *mon;
+       unsigned int            len;
+       u32                     state;
+       struct nsm_private      priv;
 };
 
 /*