[PATCH] lockd endianness annotations

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Acked-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

4 files changed, 34 insertions, 34 deletions

diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index 2909619c029..862d9730a60 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -154,7 +154,7 @@ int		  nlm_async_reply(struct nlm_rqst *, u32, const struct rpc_call_ops *);
 struct nlm_wait * nlmclnt_prepare_block(struct nlm_host *host, struct file_lock *fl);
 void              nlmclnt_finish_block(struct nlm_wait *block);
 int               nlmclnt_block(struct nlm_wait *block, struct nlm_rqst *req, long timeout);
-u32               nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *);
+__be32            nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *);
 void              nlmclnt_recovery(struct nlm_host *);
 int               nlmclnt_reclaim(struct nlm_host *, struct file_lock *);
 void              nlmclnt_next_cookie(struct nlm_cookie *);
@@ -184,12 +184,12 @@ typedef int	  (*nlm_host_match_fn_t)(struct nlm_host *cur, struct nlm_host *ref)
 /*
  * Server-side lock handling
  */
-u32               nlmsvc_lock(struct svc_rqst *, struct nlm_file *,
+__be32            nlmsvc_lock(struct svc_rqst *, struct nlm_file *,
                                         struct nlm_lock *, int, struct nlm_cookie *);
-u32               nlmsvc_unlock(struct nlm_file *, struct nlm_lock *);
-u32               nlmsvc_testlock(struct nlm_file *, struct nlm_lock *,
+__be32            nlmsvc_unlock(struct nlm_file *, struct nlm_lock *);
+__be32            nlmsvc_testlock(struct nlm_file *, struct nlm_lock *,
                                         struct nlm_lock *);
-u32               nlmsvc_cancel_blocked(struct nlm_file *, struct nlm_lock *);
+__be32            nlmsvc_cancel_blocked(struct nlm_file *, struct nlm_lock *);
 unsigned long     nlmsvc_retry_blocked(void);
 void              nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *,
                                         nlm_host_match_fn_t match);
@@ -198,7 +198,7 @@ void		  nlmsvc_grant_reply(struct nlm_cookie *, u32);
 /*
  * File handling for the server personality
  */
-u32               nlm_lookup_file(struct svc_rqst *, struct nlm_file **,
+__be32            nlm_lookup_file(struct svc_rqst *, struct nlm_file **,
                                         struct nfs_fh *);
 void              nlm_release_file(struct nlm_file *);
 void              nlmsvc_mark_resources(void);
diff --git a/include/linux/lockd/share.h b/include/linux/lockd/share.h
index cd7816e74c0..630c5bf69b0 100644
--- a/include/linux/lockd/share.h
+++ b/include/linux/lockd/share.h
@@ -21,9 +21,9 @@ struct nlm_share {
         u32                     s_mode;         /* deny mode */
 };
 
-u32     nlmsvc_share_file(struct nlm_host *, struct nlm_file *,
+__be32  nlmsvc_share_file(struct nlm_host *, struct nlm_file *,
                                                struct nlm_args *);
-u32     nlmsvc_unshare_file(struct nlm_host *, struct nlm_file *,
+__be32  nlmsvc_unshare_file(struct nlm_host *, struct nlm_file *,
                                                struct nlm_args *);
 void    nlmsvc_traverse_shares(struct nlm_host *, struct nlm_file *,
                                                nlm_host_match_fn_t);
diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h
index 66fdae3b490..29e7d9fc9da 100644
--- a/include/linux/lockd/xdr.h
+++ b/include/linux/lockd/xdr.h
@@ -90,19 +90,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 *);
diff --git a/include/linux/lockd/xdr4.h b/include/linux/lockd/xdr4.h
index 3cc1ae25009..dd12b4c9e61 100644
--- a/include/linux/lockd/xdr4.h
+++ b/include/linux/lockd/xdr4.h
@@ -23,19 +23,19 @@
 
 
 
-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 *);