Merge branch 'topic/jack-mechanical' into to-push

[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..d6b3a802c0469a8e65311058167b6e2d5bacd76c 100644 (file)
--- a/include/linux/lockd/xdr.h
+++ b/include/linux/lockd/xdr.h
@@ -29,7 +29,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;
@@ -78,11 +78,9 @@ struct nlm_res {
  */
 struct nlm_reboot {
        char *          mon;
-       int             len;
+       unsigned int    len;
        u32             state;
        __be32          addr;
-       __be32          vers;
-       __be32          proto;
 };
 
 /*