Merge branch 'omap-fixes'

[linux-2.6-omap-h63xx.git] / include / linux / lockd / xdr.h

diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h
index 83a1f9f6237b5f539f52cda2b6b09eeb013dd97c..d39ed1cc5fbf48648880825560d04d1ec1ebba44 100644 (file)
--- a/include/linux/lockd/xdr.h
+++ b/include/linux/lockd/xdr.h
@@ -13,23 +13,30 @@
 #include <linux/nfs.h>
 #include <linux/sunrpc/xdr.h>
 
+#define SM_MAXSTRLEN           1024
+#define SM_PRIV_SIZE           16
+
+struct nsm_private {
+       unsigned char           data[SM_PRIV_SIZE];
+};
+
 struct svc_rqst;
 
 #define NLM_MAXCOOKIELEN       32
 #define NLM_MAXSTRLEN          1024
 
-#define        nlm_granted             __constant_htonl(NLM_LCK_GRANTED)
-#define        nlm_lck_denied          __constant_htonl(NLM_LCK_DENIED)
-#define        nlm_lck_denied_nolocks  __constant_htonl(NLM_LCK_DENIED_NOLOCKS)
-#define        nlm_lck_blocked         __constant_htonl(NLM_LCK_BLOCKED)
-#define        nlm_lck_denied_grace_period     __constant_htonl(NLM_LCK_DENIED_GRACE_PERIOD)
+#define        nlm_granted             cpu_to_be32(NLM_LCK_GRANTED)
+#define        nlm_lck_denied          cpu_to_be32(NLM_LCK_DENIED)
+#define        nlm_lck_denied_nolocks  cpu_to_be32(NLM_LCK_DENIED_NOLOCKS)
+#define        nlm_lck_blocked         cpu_to_be32(NLM_LCK_BLOCKED)
+#define        nlm_lck_denied_grace_period     cpu_to_be32(NLM_LCK_DENIED_GRACE_PERIOD)
 
-#define nlm_drop_reply         __constant_htonl(30000)
+#define nlm_drop_reply         cpu_to_be32(30000)
 
 /* 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;
@@ -77,12 +84,10 @@ struct nlm_res {
  * statd callback when client has rebooted
  */
 struct nlm_reboot {
-       char *          mon;
-       int             len;
-       u32             state;
-       __be32          addr;
-       __be32          vers;
-       __be32          proto;
+       char                    *mon;
+       unsigned int            len;
+       u32                     state;
+       struct nsm_private      priv;
 };
 
 /*