Merge branch 'topic/jack' into topic/docbook-fix

[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 d6b3a802c0469a8e65311058167b6e2d5bacd76c..7dc5b6cb44cddd8a3dc1aa854cbc646d5ab1f9ba 100644 (file)
--- a/include/linux/lockd/xdr.h
+++ b/include/linux/lockd/xdr.h
@@ -13,6 +13,13 @@
 #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
@@ -77,10 +84,10 @@ struct nlm_res {
  * statd callback when client has rebooted
  */
 struct nlm_reboot {
-       char *          mon;
-       unsigned int    len;
-       u32             state;
-       __be32          addr;
+       char                    *mon;
+       unsigned int            len;
+       u32                     state;
+       struct nsm_private      priv;
 };
 
 /*