Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[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 66fdae3b490cca8eaa5ca96f7f9ab9e9eb43849e..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;
@@ -69,7 +69,7 @@ typedef struct nlm_args nlm_args;
  */
 struct nlm_res {
        struct nlm_cookie       cookie;
-       u32                     status;
+       __be32                  status;
        struct nlm_lock         lock;
 };
 
@@ -78,11 +78,9 @@ struct nlm_res {
  */
 struct nlm_reboot {
        char *          mon;
-       int             len;
+       unsigned int    len;
        u32             state;
-       u32             addr;
-       u32             vers;
-       u32             proto;
+       __be32          addr;
 };
 
 /*
@@ -90,19 +88,19 @@ struct nlm_reboot {
  */
 #define NLMSVC_XDRSIZE         sizeof(struct nlm_args)
 
-int    nlmsvc_decode_testargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int    nlmsvc_encode_testres(struct svc_rqst *, u32 *, struct nlm_res *);
-int    nlmsvc_decode_lockargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int    nlmsvc_decode_cancargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int    nlmsvc_decode_unlockargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int    nlmsvc_encode_res(struct svc_rqst *, u32 *, struct nlm_res *);
-int    nlmsvc_decode_res(struct svc_rqst *, u32 *, struct nlm_res *);
-int    nlmsvc_encode_void(struct svc_rqst *, u32 *, void *);
-int    nlmsvc_decode_void(struct svc_rqst *, u32 *, void *);
-int    nlmsvc_decode_shareargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int    nlmsvc_encode_shareres(struct svc_rqst *, u32 *, struct nlm_res *);
-int    nlmsvc_decode_notify(struct svc_rqst *, u32 *, struct nlm_args *);
-int    nlmsvc_decode_reboot(struct svc_rqst *, u32 *, struct nlm_reboot *);
+int    nlmsvc_decode_testargs(struct svc_rqst *, __be32 *, struct nlm_args *);
+int    nlmsvc_encode_testres(struct svc_rqst *, __be32 *, struct nlm_res *);
+int    nlmsvc_decode_lockargs(struct svc_rqst *, __be32 *, struct nlm_args *);
+int    nlmsvc_decode_cancargs(struct svc_rqst *, __be32 *, struct nlm_args *);
+int    nlmsvc_decode_unlockargs(struct svc_rqst *, __be32 *, struct nlm_args *);
+int    nlmsvc_encode_res(struct svc_rqst *, __be32 *, struct nlm_res *);
+int    nlmsvc_decode_res(struct svc_rqst *, __be32 *, struct nlm_res *);
+int    nlmsvc_encode_void(struct svc_rqst *, __be32 *, void *);
+int    nlmsvc_decode_void(struct svc_rqst *, __be32 *, void *);
+int    nlmsvc_decode_shareargs(struct svc_rqst *, __be32 *, struct nlm_args *);
+int    nlmsvc_encode_shareres(struct svc_rqst *, __be32 *, struct nlm_res *);
+int    nlmsvc_decode_notify(struct svc_rqst *, __be32 *, struct nlm_args *);
+int    nlmsvc_decode_reboot(struct svc_rqst *, __be32 *, struct nlm_reboot *);
 /*
 int    nlmclt_encode_testargs(struct rpc_rqst *, u32 *, struct nlm_args *);
 int    nlmclt_encode_lockargs(struct rpc_rqst *, u32 *, struct nlm_args *);