Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus

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

diff --git a/include/linux/lockd/xdr4.h b/include/linux/lockd/xdr4.h
index 3cc1ae25009b7e63d7f973311b94a600062b8e62..12bfe09de2b11629993f80f29d9c947f045d494b 100644 (file)
--- a/include/linux/lockd/xdr4.h
+++ b/include/linux/lockd/xdr4.h
@@ -23,24 +23,25 @@
 
 
 
-int    nlm4svc_decode_testargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int    nlm4svc_encode_testres(struct svc_rqst *, u32 *, struct nlm_res *);
-int    nlm4svc_decode_lockargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int    nlm4svc_decode_cancargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int    nlm4svc_decode_unlockargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int    nlm4svc_encode_res(struct svc_rqst *, u32 *, struct nlm_res *);
-int    nlm4svc_decode_res(struct svc_rqst *, u32 *, struct nlm_res *);
-int    nlm4svc_encode_void(struct svc_rqst *, u32 *, void *);
-int    nlm4svc_decode_void(struct svc_rqst *, u32 *, void *);
-int    nlm4svc_decode_shareargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int    nlm4svc_encode_shareres(struct svc_rqst *, u32 *, struct nlm_res *);
-int    nlm4svc_decode_notify(struct svc_rqst *, u32 *, struct nlm_args *);
-int    nlm4svc_decode_reboot(struct svc_rqst *, u32 *, struct nlm_reboot *);
+int    nlm4svc_decode_testargs(struct svc_rqst *, __be32 *, struct nlm_args *);
+int    nlm4svc_encode_testres(struct svc_rqst *, __be32 *, struct nlm_res *);
+int    nlm4svc_decode_lockargs(struct svc_rqst *, __be32 *, struct nlm_args *);
+int    nlm4svc_decode_cancargs(struct svc_rqst *, __be32 *, struct nlm_args *);
+int    nlm4svc_decode_unlockargs(struct svc_rqst *, __be32 *, struct nlm_args *);
+int    nlm4svc_encode_res(struct svc_rqst *, __be32 *, struct nlm_res *);
+int    nlm4svc_decode_res(struct svc_rqst *, __be32 *, struct nlm_res *);
+int    nlm4svc_encode_void(struct svc_rqst *, __be32 *, void *);
+int    nlm4svc_decode_void(struct svc_rqst *, __be32 *, void *);
+int    nlm4svc_decode_shareargs(struct svc_rqst *, __be32 *, struct nlm_args *);
+int    nlm4svc_encode_shareres(struct svc_rqst *, __be32 *, struct nlm_res *);
+int    nlm4svc_decode_notify(struct svc_rqst *, __be32 *, struct nlm_args *);
+int    nlm4svc_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 *);
 int    nlmclt_encode_cancargs(struct rpc_rqst *, u32 *, struct nlm_args *);
 int    nlmclt_encode_unlockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
  */
+extern struct rpc_version nlm_version4;
 
 #endif /* LOCKD_XDR4_H */