nfs: replace uses of __constant_{endian}

The base versions handle constant folding now, none of these headers are exported to userspace, so the __ prefixed versions are not necessary. Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Reviewed-by: NeilBrown <neilb@suse.de> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
author: Harvey Harrison <harvey.harrison@gmail.com> 2009-02-11 20:16:58 -0500
committer: J. Bruce Fields <bfields@citi.umich.edu> 2009-03-18 17:30:51 -0400
commit: 77f18f5e4ebdea35ec3d92343b0ed7546dc87637 (patch)
tree: dd9a97818130a8596b1833c82a625b3ed9cf9186
parent: 4ac35c2f794503d3acda20d98e89cf63f6e94332 (diff)
4 files changed, 98 insertions, 98 deletions
diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h
index 7dc5b6cb44cd..d39ed1cc5fbf 100644
--- a/include/linux/lockd/xdr.h
+++ b/include/linux/lockd/xdr.h
@@ -25,13 +25,13 @@ struct svc_rqst;
 #define NLM_MAXCOOKIELEN        32
 #define NLM_MAXSTRLEN           1024
-#define nlm_granted             __constant_htonl(NLM_LCK_GRANTED)
+#define nlm_granted             cpu_to_be32(NLM_LCK_GRANTED)
-#define nlm_lck_denied          __constant_htonl(NLM_LCK_DENIED)
+#define nlm_lck_denied          cpu_to_be32(NLM_LCK_DENIED)
-#define nlm_lck_denied_nolocks  __constant_htonl(NLM_LCK_DENIED_NOLOCKS)
+#define nlm_lck_denied_nolocks  cpu_to_be32(NLM_LCK_DENIED_NOLOCKS)
-#define nlm_lck_blocked         __constant_htonl(NLM_LCK_BLOCKED)
+#define nlm_lck_blocked         cpu_to_be32(NLM_LCK_BLOCKED)
-#define nlm_lck_denied_grace_period     __constant_htonl(NLM_LCK_DENIED_GRACE_PERIOD)
+#define nlm_lck_denied_grace_period     cpu_to_be32(NLM_LCK_DENIED_GRACE_PERIOD)
-#define nlm_drop_reply          __constant_htonl(30000)
+#define nlm_drop_reply          cpu_to_be32(30000)
 /* Lock info passed via NLM */
 struct nlm_lock {
diff --git a/include/linux/lockd/xdr4.h b/include/linux/lockd/xdr4.h
index 12bfe09de2b1..7353821341ed 100644
--- a/include/linux/lockd/xdr4.h
+++ b/include/linux/lockd/xdr4.h
@@ -15,11 +15,11 @@
 #include <linux/lockd/xdr.h>
 /* error codes new to NLMv4 */
-#define nlm4_deadlock           __constant_htonl(NLM_DEADLCK)
+#define nlm4_deadlock           cpu_to_be32(NLM_DEADLCK)
-#define nlm4_rofs               __constant_htonl(NLM_ROFS)
+#define nlm4_rofs               cpu_to_be32(NLM_ROFS)
-#define nlm4_stale_fh           __constant_htonl(NLM_STALE_FH)
+#define nlm4_stale_fh           cpu_to_be32(NLM_STALE_FH)
-#define nlm4_fbig               __constant_htonl(NLM_FBIG)
+#define nlm4_fbig               cpu_to_be32(NLM_FBIG)
-#define nlm4_failed             __constant_htonl(NLM_FAILED)
+#define nlm4_failed             cpu_to_be32(NLM_FAILED)
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index e19f45991b2e..16f7b403d9c1 100644
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -186,78 +186,78 @@ void		nfsd_lockd_shutdown(void);
 /*
 * These macros provide pre-xdr'ed values for faster operation.
 */
-#define nfs_ok                  __constant_htonl(NFS_OK)
+#define nfs_ok                  cpu_to_be32(NFS_OK)
-#define nfserr_perm             __constant_htonl(NFSERR_PERM)
+#define nfserr_perm             cpu_to_be32(NFSERR_PERM)
-#define nfserr_noent            __constant_htonl(NFSERR_NOENT)
+#define nfserr_noent            cpu_to_be32(NFSERR_NOENT)
-#define nfserr_io               __constant_htonl(NFSERR_IO)
+#define nfserr_io               cpu_to_be32(NFSERR_IO)
-#define nfserr_nxio             __constant_htonl(NFSERR_NXIO)
+#define nfserr_nxio             cpu_to_be32(NFSERR_NXIO)
-#define nfserr_eagain           __constant_htonl(NFSERR_EAGAIN)
+#define nfserr_eagain           cpu_to_be32(NFSERR_EAGAIN)
-#define nfserr_acces            __constant_htonl(NFSERR_ACCES)
+#define nfserr_acces            cpu_to_be32(NFSERR_ACCES)
-#define nfserr_exist            __constant_htonl(NFSERR_EXIST)
+#define nfserr_exist            cpu_to_be32(NFSERR_EXIST)
-#define nfserr_xdev             __constant_htonl(NFSERR_XDEV)
+#define nfserr_xdev             cpu_to_be32(NFSERR_XDEV)
-#define nfserr_nodev            __constant_htonl(NFSERR_NODEV)
+#define nfserr_nodev            cpu_to_be32(NFSERR_NODEV)
-#define nfserr_notdir           __constant_htonl(NFSERR_NOTDIR)
+#define nfserr_notdir           cpu_to_be32(NFSERR_NOTDIR)
-#define nfserr_isdir            __constant_htonl(NFSERR_ISDIR)
+#define nfserr_isdir            cpu_to_be32(NFSERR_ISDIR)
-#define nfserr_inval            __constant_htonl(NFSERR_INVAL)
+#define nfserr_inval            cpu_to_be32(NFSERR_INVAL)
-#define nfserr_fbig             __constant_htonl(NFSERR_FBIG)
+#define nfserr_fbig             cpu_to_be32(NFSERR_FBIG)
-#define nfserr_nospc            __constant_htonl(NFSERR_NOSPC)
+#define nfserr_nospc            cpu_to_be32(NFSERR_NOSPC)
-#define nfserr_rofs             __constant_htonl(NFSERR_ROFS)
+#define nfserr_rofs             cpu_to_be32(NFSERR_ROFS)
-#define nfserr_mlink            __constant_htonl(NFSERR_MLINK)
+#define nfserr_mlink            cpu_to_be32(NFSERR_MLINK)
-#define nfserr_opnotsupp        __constant_htonl(NFSERR_OPNOTSUPP)
+#define nfserr_opnotsupp        cpu_to_be32(NFSERR_OPNOTSUPP)
-#define nfserr_nametoolong      __constant_htonl(NFSERR_NAMETOOLONG)
+#define nfserr_nametoolong      cpu_to_be32(NFSERR_NAMETOOLONG)
-#define nfserr_notempty         __constant_htonl(NFSERR_NOTEMPTY)
+#define nfserr_notempty         cpu_to_be32(NFSERR_NOTEMPTY)
-#define nfserr_dquot            __constant_htonl(NFSERR_DQUOT)
+#define nfserr_dquot            cpu_to_be32(NFSERR_DQUOT)
-#define nfserr_stale            __constant_htonl(NFSERR_STALE)
+#define nfserr_stale            cpu_to_be32(NFSERR_STALE)
-#define nfserr_remote           __constant_htonl(NFSERR_REMOTE)
+#define nfserr_remote           cpu_to_be32(NFSERR_REMOTE)
-#define nfserr_wflush           __constant_htonl(NFSERR_WFLUSH)
+#define nfserr_wflush           cpu_to_be32(NFSERR_WFLUSH)
-#define nfserr_badhandle        __constant_htonl(NFSERR_BADHANDLE)
+#define nfserr_badhandle        cpu_to_be32(NFSERR_BADHANDLE)
-#define nfserr_notsync          __constant_htonl(NFSERR_NOT_SYNC)
+#define nfserr_notsync          cpu_to_be32(NFSERR_NOT_SYNC)
-#define nfserr_badcookie        __constant_htonl(NFSERR_BAD_COOKIE)
+#define nfserr_badcookie        cpu_to_be32(NFSERR_BAD_COOKIE)
-#define nfserr_notsupp          __constant_htonl(NFSERR_NOTSUPP)
+#define nfserr_notsupp          cpu_to_be32(NFSERR_NOTSUPP)
-#define nfserr_toosmall         __constant_htonl(NFSERR_TOOSMALL)
+#define nfserr_toosmall         cpu_to_be32(NFSERR_TOOSMALL)
-#define nfserr_serverfault      __constant_htonl(NFSERR_SERVERFAULT)
+#define nfserr_serverfault      cpu_to_be32(NFSERR_SERVERFAULT)
-#define nfserr_badtype          __constant_htonl(NFSERR_BADTYPE)
+#define nfserr_badtype          cpu_to_be32(NFSERR_BADTYPE)
-#define nfserr_jukebox          __constant_htonl(NFSERR_JUKEBOX)
+#define nfserr_jukebox          cpu_to_be32(NFSERR_JUKEBOX)
-#define nfserr_denied           __constant_htonl(NFSERR_DENIED)
+#define nfserr_denied           cpu_to_be32(NFSERR_DENIED)
-#define nfserr_deadlock         __constant_htonl(NFSERR_DEADLOCK)
+#define nfserr_deadlock         cpu_to_be32(NFSERR_DEADLOCK)
-#define nfserr_expired          __constant_htonl(NFSERR_EXPIRED)
+#define nfserr_expired          cpu_to_be32(NFSERR_EXPIRED)
-#define nfserr_bad_cookie       __constant_htonl(NFSERR_BAD_COOKIE)
+#define nfserr_bad_cookie       cpu_to_be32(NFSERR_BAD_COOKIE)
-#define nfserr_same             __constant_htonl(NFSERR_SAME)
+#define nfserr_same             cpu_to_be32(NFSERR_SAME)
-#define nfserr_clid_inuse       __constant_htonl(NFSERR_CLID_INUSE)
+#define nfserr_clid_inuse       cpu_to_be32(NFSERR_CLID_INUSE)
-#define nfserr_stale_clientid   __constant_htonl(NFSERR_STALE_CLIENTID)
+#define nfserr_stale_clientid   cpu_to_be32(NFSERR_STALE_CLIENTID)
-#define nfserr_resource         __constant_htonl(NFSERR_RESOURCE)
+#define nfserr_resource         cpu_to_be32(NFSERR_RESOURCE)
-#define nfserr_moved            __constant_htonl(NFSERR_MOVED)
+#define nfserr_moved            cpu_to_be32(NFSERR_MOVED)
-#define nfserr_nofilehandle     __constant_htonl(NFSERR_NOFILEHANDLE)
+#define nfserr_nofilehandle     cpu_to_be32(NFSERR_NOFILEHANDLE)
-#define nfserr_minor_vers_mismatch      __constant_htonl(NFSERR_MINOR_VERS_MISMATCH)
+#define nfserr_minor_vers_mismatch      cpu_to_be32(NFSERR_MINOR_VERS_MISMATCH)
-#define nfserr_share_denied     __constant_htonl(NFSERR_SHARE_DENIED)
+#define nfserr_share_denied     cpu_to_be32(NFSERR_SHARE_DENIED)
-#define nfserr_stale_stateid    __constant_htonl(NFSERR_STALE_STATEID)
+#define nfserr_stale_stateid    cpu_to_be32(NFSERR_STALE_STATEID)
-#define nfserr_old_stateid      __constant_htonl(NFSERR_OLD_STATEID)
+#define nfserr_old_stateid      cpu_to_be32(NFSERR_OLD_STATEID)
-#define nfserr_bad_stateid      __constant_htonl(NFSERR_BAD_STATEID)
+#define nfserr_bad_stateid      cpu_to_be32(NFSERR_BAD_STATEID)
-#define nfserr_bad_seqid        __constant_htonl(NFSERR_BAD_SEQID)
+#define nfserr_bad_seqid        cpu_to_be32(NFSERR_BAD_SEQID)
-#define nfserr_symlink          __constant_htonl(NFSERR_SYMLINK)
+#define nfserr_symlink          cpu_to_be32(NFSERR_SYMLINK)
-#define nfserr_not_same         __constant_htonl(NFSERR_NOT_SAME)
+#define nfserr_not_same         cpu_to_be32(NFSERR_NOT_SAME)
-#define nfserr_restorefh        __constant_htonl(NFSERR_RESTOREFH)
+#define nfserr_restorefh        cpu_to_be32(NFSERR_RESTOREFH)
-#define nfserr_attrnotsupp      __constant_htonl(NFSERR_ATTRNOTSUPP)
+#define nfserr_attrnotsupp      cpu_to_be32(NFSERR_ATTRNOTSUPP)
-#define nfserr_bad_xdr          __constant_htonl(NFSERR_BAD_XDR)
+#define nfserr_bad_xdr          cpu_to_be32(NFSERR_BAD_XDR)
-#define nfserr_openmode         __constant_htonl(NFSERR_OPENMODE)
+#define nfserr_openmode         cpu_to_be32(NFSERR_OPENMODE)
-#define nfserr_locks_held       __constant_htonl(NFSERR_LOCKS_HELD)
+#define nfserr_locks_held       cpu_to_be32(NFSERR_LOCKS_HELD)
-#define nfserr_op_illegal       __constant_htonl(NFSERR_OP_ILLEGAL)
+#define nfserr_op_illegal       cpu_to_be32(NFSERR_OP_ILLEGAL)
-#define nfserr_grace            __constant_htonl(NFSERR_GRACE)
+#define nfserr_grace            cpu_to_be32(NFSERR_GRACE)
-#define nfserr_no_grace         __constant_htonl(NFSERR_NO_GRACE)
+#define nfserr_no_grace         cpu_to_be32(NFSERR_NO_GRACE)
-#define nfserr_reclaim_bad      __constant_htonl(NFSERR_RECLAIM_BAD)
+#define nfserr_reclaim_bad      cpu_to_be32(NFSERR_RECLAIM_BAD)
-#define nfserr_badname          __constant_htonl(NFSERR_BADNAME)
+#define nfserr_badname          cpu_to_be32(NFSERR_BADNAME)
-#define nfserr_cb_path_down     __constant_htonl(NFSERR_CB_PATH_DOWN)
+#define nfserr_cb_path_down     cpu_to_be32(NFSERR_CB_PATH_DOWN)
-#define nfserr_locked           __constant_htonl(NFSERR_LOCKED)
+#define nfserr_locked           cpu_to_be32(NFSERR_LOCKED)
-#define nfserr_wrongsec         __constant_htonl(NFSERR_WRONGSEC)
+#define nfserr_wrongsec         cpu_to_be32(NFSERR_WRONGSEC)
-#define nfserr_replay_me        __constant_htonl(NFSERR_REPLAY_ME)
+#define nfserr_replay_me        cpu_to_be32(NFSERR_REPLAY_ME)
 /* error codes for internal use */
 /* if a request fails due to kmalloc failure, it gets dropped.
 *  Client should resend eventually
 */
-#define nfserr_dropit           __constant_htonl(30000)
+#define nfserr_dropit           cpu_to_be32(30000)
 /* end-of-file indicator in readdir */
-#define nfserr_eof              __constant_htonl(30001)
+#define nfserr_eof              cpu_to_be32(30001)
 /* Check for dir entries '.' and '..' */
 #define isdotent(n, l)  (l < 3 && n[0] == '.' && (l == 1 || n[1] == '.'))
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index 49e1eb454465..d8910b68e1bd 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -69,27 +69,27 @@ struct xdr_buf {
 * pre-xdr'ed macros.
 */
-#define xdr_zero        __constant_htonl(0)
+#define xdr_zero        cpu_to_be32(0)
-#define xdr_one         __constant_htonl(1)
+#define xdr_one         cpu_to_be32(1)
-#define xdr_two         __constant_htonl(2)
+#define xdr_two         cpu_to_be32(2)
-#define rpc_success             __constant_htonl(RPC_SUCCESS)
+#define rpc_success             cpu_to_be32(RPC_SUCCESS)
-#define rpc_prog_unavail        __constant_htonl(RPC_PROG_UNAVAIL)
+#define rpc_prog_unavail        cpu_to_be32(RPC_PROG_UNAVAIL)
-#define rpc_prog_mismatch       __constant_htonl(RPC_PROG_MISMATCH)
+#define rpc_prog_mismatch       cpu_to_be32(RPC_PROG_MISMATCH)
-#define rpc_proc_unavail        __constant_htonl(RPC_PROC_UNAVAIL)
+#define rpc_proc_unavail        cpu_to_be32(RPC_PROC_UNAVAIL)
-#define rpc_garbage_args        __constant_htonl(RPC_GARBAGE_ARGS)
+#define rpc_garbage_args        cpu_to_be32(RPC_GARBAGE_ARGS)
-#define rpc_system_err          __constant_htonl(RPC_SYSTEM_ERR)
+#define rpc_system_err          cpu_to_be32(RPC_SYSTEM_ERR)
-#define rpc_drop_reply          __constant_htonl(RPC_DROP_REPLY)
+#define rpc_drop_reply          cpu_to_be32(RPC_DROP_REPLY)
-#define rpc_auth_ok             __constant_htonl(RPC_AUTH_OK)
+#define rpc_auth_ok             cpu_to_be32(RPC_AUTH_OK)
-#define rpc_autherr_badcred     __constant_htonl(RPC_AUTH_BADCRED)
+#define rpc_autherr_badcred     cpu_to_be32(RPC_AUTH_BADCRED)
-#define rpc_autherr_rejectedcred __constant_htonl(RPC_AUTH_REJECTEDCRED)
+#define rpc_autherr_rejectedcred cpu_to_be32(RPC_AUTH_REJECTEDCRED)
-#define rpc_autherr_badverf     __constant_htonl(RPC_AUTH_BADVERF)
+#define rpc_autherr_badverf     cpu_to_be32(RPC_AUTH_BADVERF)
-#define rpc_autherr_rejectedverf __constant_htonl(RPC_AUTH_REJECTEDVERF)
+#define rpc_autherr_rejectedverf cpu_to_be32(RPC_AUTH_REJECTEDVERF)
-#define rpc_autherr_tooweak     __constant_htonl(RPC_AUTH_TOOWEAK)
+#define rpc_autherr_tooweak     cpu_to_be32(RPC_AUTH_TOOWEAK)
-#define rpcsec_gsserr_credproblem       __constant_htonl(RPCSEC_GSS_CREDPROBLEM)
+#define rpcsec_gsserr_credproblem       cpu_to_be32(RPCSEC_GSS_CREDPROBLEM)
-#define rpcsec_gsserr_ctxproblem        __constant_htonl(RPCSEC_GSS_CTXPROBLEM)
+#define rpcsec_gsserr_ctxproblem        cpu_to_be32(RPCSEC_GSS_CTXPROBLEM)
-#define rpc_autherr_oldseqnum   __constant_htonl(101)
+#define rpc_autherr_oldseqnum   cpu_to_be32(101)
 /*
 * Miscellaneous XDR helper functions
author	Harvey Harrison <harvey.harrison@gmail.com>	2009-02-11 20:16:58 -0500
committer	J. Bruce Fields <bfields@citi.umich.edu>	2009-03-18 17:30:51 -0400
commit	77f18f5e4ebdea35ec3d92343b0ed7546dc87637 (patch)
tree	dd9a97818130a8596b1833c82a625b3ed9cf9186
parent	4ac35c2f794503d3acda20d98e89cf63f6e94332 (diff)

diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h index 7dc5b6cb44cd..d39ed1cc5fbf 100644 --- a/include/linux/lockd/xdr.h +++ b/include/linux/lockd/xdr.h
@@ -25,13 +25,13 @@ struct svc_rqst;
25	#define NLM_MAXCOOKIELEN 32	25	#define NLM_MAXCOOKIELEN 32
26	#define NLM_MAXSTRLEN 1024	26	#define NLM_MAXSTRLEN 1024
27		27
28	#define nlm_granted __constant_htonl(NLM_LCK_GRANTED)	28	#define nlm_granted cpu_to_be32(NLM_LCK_GRANTED)
29	#define nlm_lck_denied __constant_htonl(NLM_LCK_DENIED)	29	#define nlm_lck_denied cpu_to_be32(NLM_LCK_DENIED)
30	#define nlm_lck_denied_nolocks __constant_htonl(NLM_LCK_DENIED_NOLOCKS)	30	#define nlm_lck_denied_nolocks cpu_to_be32(NLM_LCK_DENIED_NOLOCKS)
31	#define nlm_lck_blocked __constant_htonl(NLM_LCK_BLOCKED)	31	#define nlm_lck_blocked cpu_to_be32(NLM_LCK_BLOCKED)
32	#define nlm_lck_denied_grace_period __constant_htonl(NLM_LCK_DENIED_GRACE_PERIOD)	32	#define nlm_lck_denied_grace_period cpu_to_be32(NLM_LCK_DENIED_GRACE_PERIOD)
33		33
34	#define nlm_drop_reply __constant_htonl(30000)	34	#define nlm_drop_reply cpu_to_be32(30000)
35		35
36	/* Lock info passed via NLM */	36	/* Lock info passed via NLM */
37	struct nlm_lock {	37	struct nlm_lock {


diff --git a/include/linux/lockd/xdr4.h b/include/linux/lockd/xdr4.h index 12bfe09de2b1..7353821341ed 100644 --- a/include/linux/lockd/xdr4.h +++ b/include/linux/lockd/xdr4.h
@@ -15,11 +15,11 @@
15	#include <linux/lockd/xdr.h>	15	#include <linux/lockd/xdr.h>
16		16
17	/* error codes new to NLMv4 */	17	/* error codes new to NLMv4 */
18	#define nlm4_deadlock __constant_htonl(NLM_DEADLCK)	18	#define nlm4_deadlock cpu_to_be32(NLM_DEADLCK)
19	#define nlm4_rofs __constant_htonl(NLM_ROFS)	19	#define nlm4_rofs cpu_to_be32(NLM_ROFS)
20	#define nlm4_stale_fh __constant_htonl(NLM_STALE_FH)	20	#define nlm4_stale_fh cpu_to_be32(NLM_STALE_FH)
21	#define nlm4_fbig __constant_htonl(NLM_FBIG)	21	#define nlm4_fbig cpu_to_be32(NLM_FBIG)
22	#define nlm4_failed __constant_htonl(NLM_FAILED)	22	#define nlm4_failed cpu_to_be32(NLM_FAILED)
23		23
24		24
25		25


diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h index e19f45991b2e..16f7b403d9c1 100644 --- a/include/linux/nfsd/nfsd.h +++ b/include/linux/nfsd/nfsd.h
@@ -186,78 +186,78 @@ void nfsd_lockd_shutdown(void);
186	/*	186	/*
187	* These macros provide pre-xdr'ed values for faster operation.	187	* These macros provide pre-xdr'ed values for faster operation.
188	*/	188	*/
189	#define nfs_ok __constant_htonl(NFS_OK)	189	#define nfs_ok cpu_to_be32(NFS_OK)
190	#define nfserr_perm __constant_htonl(NFSERR_PERM)	190	#define nfserr_perm cpu_to_be32(NFSERR_PERM)
191	#define nfserr_noent __constant_htonl(NFSERR_NOENT)	191	#define nfserr_noent cpu_to_be32(NFSERR_NOENT)
192	#define nfserr_io __constant_htonl(NFSERR_IO)	192	#define nfserr_io cpu_to_be32(NFSERR_IO)
193	#define nfserr_nxio __constant_htonl(NFSERR_NXIO)	193	#define nfserr_nxio cpu_to_be32(NFSERR_NXIO)
194	#define nfserr_eagain __constant_htonl(NFSERR_EAGAIN)	194	#define nfserr_eagain cpu_to_be32(NFSERR_EAGAIN)
195	#define nfserr_acces __constant_htonl(NFSERR_ACCES)	195	#define nfserr_acces cpu_to_be32(NFSERR_ACCES)
196	#define nfserr_exist __constant_htonl(NFSERR_EXIST)	196	#define nfserr_exist cpu_to_be32(NFSERR_EXIST)
197	#define nfserr_xdev __constant_htonl(NFSERR_XDEV)	197	#define nfserr_xdev cpu_to_be32(NFSERR_XDEV)
198	#define nfserr_nodev __constant_htonl(NFSERR_NODEV)	198	#define nfserr_nodev cpu_to_be32(NFSERR_NODEV)
199	#define nfserr_notdir __constant_htonl(NFSERR_NOTDIR)	199	#define nfserr_notdir cpu_to_be32(NFSERR_NOTDIR)
200	#define nfserr_isdir __constant_htonl(NFSERR_ISDIR)	200	#define nfserr_isdir cpu_to_be32(NFSERR_ISDIR)
201	#define nfserr_inval __constant_htonl(NFSERR_INVAL)	201	#define nfserr_inval cpu_to_be32(NFSERR_INVAL)
202	#define nfserr_fbig __constant_htonl(NFSERR_FBIG)	202	#define nfserr_fbig cpu_to_be32(NFSERR_FBIG)
203	#define nfserr_nospc __constant_htonl(NFSERR_NOSPC)	203	#define nfserr_nospc cpu_to_be32(NFSERR_NOSPC)
204	#define nfserr_rofs __constant_htonl(NFSERR_ROFS)	204	#define nfserr_rofs cpu_to_be32(NFSERR_ROFS)
205	#define nfserr_mlink __constant_htonl(NFSERR_MLINK)	205	#define nfserr_mlink cpu_to_be32(NFSERR_MLINK)
206	#define nfserr_opnotsupp __constant_htonl(NFSERR_OPNOTSUPP)	206	#define nfserr_opnotsupp cpu_to_be32(NFSERR_OPNOTSUPP)
207	#define nfserr_nametoolong __constant_htonl(NFSERR_NAMETOOLONG)	207	#define nfserr_nametoolong cpu_to_be32(NFSERR_NAMETOOLONG)
208	#define nfserr_notempty __constant_htonl(NFSERR_NOTEMPTY)	208	#define nfserr_notempty cpu_to_be32(NFSERR_NOTEMPTY)
209	#define nfserr_dquot __constant_htonl(NFSERR_DQUOT)	209	#define nfserr_dquot cpu_to_be32(NFSERR_DQUOT)
210	#define nfserr_stale __constant_htonl(NFSERR_STALE)	210	#define nfserr_stale cpu_to_be32(NFSERR_STALE)
211	#define nfserr_remote __constant_htonl(NFSERR_REMOTE)	211	#define nfserr_remote cpu_to_be32(NFSERR_REMOTE)
212	#define nfserr_wflush __constant_htonl(NFSERR_WFLUSH)	212	#define nfserr_wflush cpu_to_be32(NFSERR_WFLUSH)
213	#define nfserr_badhandle __constant_htonl(NFSERR_BADHANDLE)	213	#define nfserr_badhandle cpu_to_be32(NFSERR_BADHANDLE)
214	#define nfserr_notsync __constant_htonl(NFSERR_NOT_SYNC)	214	#define nfserr_notsync cpu_to_be32(NFSERR_NOT_SYNC)
215	#define nfserr_badcookie __constant_htonl(NFSERR_BAD_COOKIE)	215	#define nfserr_badcookie cpu_to_be32(NFSERR_BAD_COOKIE)
216	#define nfserr_notsupp __constant_htonl(NFSERR_NOTSUPP)	216	#define nfserr_notsupp cpu_to_be32(NFSERR_NOTSUPP)
217	#define nfserr_toosmall __constant_htonl(NFSERR_TOOSMALL)	217	#define nfserr_toosmall cpu_to_be32(NFSERR_TOOSMALL)
218	#define nfserr_serverfault __constant_htonl(NFSERR_SERVERFAULT)	218	#define nfserr_serverfault cpu_to_be32(NFSERR_SERVERFAULT)
219	#define nfserr_badtype __constant_htonl(NFSERR_BADTYPE)	219	#define nfserr_badtype cpu_to_be32(NFSERR_BADTYPE)
220	#define nfserr_jukebox __constant_htonl(NFSERR_JUKEBOX)	220	#define nfserr_jukebox cpu_to_be32(NFSERR_JUKEBOX)
221	#define nfserr_denied __constant_htonl(NFSERR_DENIED)	221	#define nfserr_denied cpu_to_be32(NFSERR_DENIED)
222	#define nfserr_deadlock __constant_htonl(NFSERR_DEADLOCK)	222	#define nfserr_deadlock cpu_to_be32(NFSERR_DEADLOCK)
223	#define nfserr_expired __constant_htonl(NFSERR_EXPIRED)	223	#define nfserr_expired cpu_to_be32(NFSERR_EXPIRED)
224	#define nfserr_bad_cookie __constant_htonl(NFSERR_BAD_COOKIE)	224	#define nfserr_bad_cookie cpu_to_be32(NFSERR_BAD_COOKIE)
225	#define nfserr_same __constant_htonl(NFSERR_SAME)	225	#define nfserr_same cpu_to_be32(NFSERR_SAME)
226	#define nfserr_clid_inuse __constant_htonl(NFSERR_CLID_INUSE)	226	#define nfserr_clid_inuse cpu_to_be32(NFSERR_CLID_INUSE)
227	#define nfserr_stale_clientid __constant_htonl(NFSERR_STALE_CLIENTID)	227	#define nfserr_stale_clientid cpu_to_be32(NFSERR_STALE_CLIENTID)
228	#define nfserr_resource __constant_htonl(NFSERR_RESOURCE)	228	#define nfserr_resource cpu_to_be32(NFSERR_RESOURCE)
229	#define nfserr_moved __constant_htonl(NFSERR_MOVED)	229	#define nfserr_moved cpu_to_be32(NFSERR_MOVED)
230	#define nfserr_nofilehandle __constant_htonl(NFSERR_NOFILEHANDLE)	230	#define nfserr_nofilehandle cpu_to_be32(NFSERR_NOFILEHANDLE)
231	#define nfserr_minor_vers_mismatch __constant_htonl(NFSERR_MINOR_VERS_MISMATCH)	231	#define nfserr_minor_vers_mismatch cpu_to_be32(NFSERR_MINOR_VERS_MISMATCH)
232	#define nfserr_share_denied __constant_htonl(NFSERR_SHARE_DENIED)	232	#define nfserr_share_denied cpu_to_be32(NFSERR_SHARE_DENIED)
233	#define nfserr_stale_stateid __constant_htonl(NFSERR_STALE_STATEID)	233	#define nfserr_stale_stateid cpu_to_be32(NFSERR_STALE_STATEID)
234	#define nfserr_old_stateid __constant_htonl(NFSERR_OLD_STATEID)	234	#define nfserr_old_stateid cpu_to_be32(NFSERR_OLD_STATEID)
235	#define nfserr_bad_stateid __constant_htonl(NFSERR_BAD_STATEID)	235	#define nfserr_bad_stateid cpu_to_be32(NFSERR_BAD_STATEID)
236	#define nfserr_bad_seqid __constant_htonl(NFSERR_BAD_SEQID)	236	#define nfserr_bad_seqid cpu_to_be32(NFSERR_BAD_SEQID)
237	#define nfserr_symlink __constant_htonl(NFSERR_SYMLINK)	237	#define nfserr_symlink cpu_to_be32(NFSERR_SYMLINK)
238	#define nfserr_not_same __constant_htonl(NFSERR_NOT_SAME)	238	#define nfserr_not_same cpu_to_be32(NFSERR_NOT_SAME)
239	#define nfserr_restorefh __constant_htonl(NFSERR_RESTOREFH)	239	#define nfserr_restorefh cpu_to_be32(NFSERR_RESTOREFH)
240	#define nfserr_attrnotsupp __constant_htonl(NFSERR_ATTRNOTSUPP)	240	#define nfserr_attrnotsupp cpu_to_be32(NFSERR_ATTRNOTSUPP)
241	#define nfserr_bad_xdr __constant_htonl(NFSERR_BAD_XDR)	241	#define nfserr_bad_xdr cpu_to_be32(NFSERR_BAD_XDR)
242	#define nfserr_openmode __constant_htonl(NFSERR_OPENMODE)	242	#define nfserr_openmode cpu_to_be32(NFSERR_OPENMODE)
243	#define nfserr_locks_held __constant_htonl(NFSERR_LOCKS_HELD)	243	#define nfserr_locks_held cpu_to_be32(NFSERR_LOCKS_HELD)
244	#define nfserr_op_illegal __constant_htonl(NFSERR_OP_ILLEGAL)	244	#define nfserr_op_illegal cpu_to_be32(NFSERR_OP_ILLEGAL)
245	#define nfserr_grace __constant_htonl(NFSERR_GRACE)	245	#define nfserr_grace cpu_to_be32(NFSERR_GRACE)
246	#define nfserr_no_grace __constant_htonl(NFSERR_NO_GRACE)	246	#define nfserr_no_grace cpu_to_be32(NFSERR_NO_GRACE)
247	#define nfserr_reclaim_bad __constant_htonl(NFSERR_RECLAIM_BAD)	247	#define nfserr_reclaim_bad cpu_to_be32(NFSERR_RECLAIM_BAD)
248	#define nfserr_badname __constant_htonl(NFSERR_BADNAME)	248	#define nfserr_badname cpu_to_be32(NFSERR_BADNAME)
249	#define nfserr_cb_path_down __constant_htonl(NFSERR_CB_PATH_DOWN)	249	#define nfserr_cb_path_down cpu_to_be32(NFSERR_CB_PATH_DOWN)
250	#define nfserr_locked __constant_htonl(NFSERR_LOCKED)	250	#define nfserr_locked cpu_to_be32(NFSERR_LOCKED)
251	#define nfserr_wrongsec __constant_htonl(NFSERR_WRONGSEC)	251	#define nfserr_wrongsec cpu_to_be32(NFSERR_WRONGSEC)
252	#define nfserr_replay_me __constant_htonl(NFSERR_REPLAY_ME)	252	#define nfserr_replay_me cpu_to_be32(NFSERR_REPLAY_ME)
253		253
254	/* error codes for internal use */	254	/* error codes for internal use */
255	/* if a request fails due to kmalloc failure, it gets dropped.	255	/* if a request fails due to kmalloc failure, it gets dropped.
256	* Client should resend eventually	256	* Client should resend eventually
257	*/	257	*/
258	#define nfserr_dropit __constant_htonl(30000)	258	#define nfserr_dropit cpu_to_be32(30000)
259	/* end-of-file indicator in readdir */	259	/* end-of-file indicator in readdir */
260	#define nfserr_eof __constant_htonl(30001)	260	#define nfserr_eof cpu_to_be32(30001)
261		261
262	/* Check for dir entries '.' and '..' */	262	/* Check for dir entries '.' and '..' */
263	#define isdotent(n, l) (l < 3 && n[0] == '.' && (l == 1 \|\| n[1] == '.'))	263	#define isdotent(n, l) (l < 3 && n[0] == '.' && (l == 1 \|\| n[1] == '.'))


diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h index 49e1eb454465..d8910b68e1bd 100644 --- a/include/linux/sunrpc/xdr.h +++ b/include/linux/sunrpc/xdr.h
@@ -69,27 +69,27 @@ struct xdr_buf {
69	* pre-xdr'ed macros.	69	* pre-xdr'ed macros.
70	*/	70	*/
71		71
72	#define xdr_zero __constant_htonl(0)	72	#define xdr_zero cpu_to_be32(0)
73	#define xdr_one __constant_htonl(1)	73	#define xdr_one cpu_to_be32(1)
74	#define xdr_two __constant_htonl(2)	74	#define xdr_two cpu_to_be32(2)
75		75
76	#define rpc_success __constant_htonl(RPC_SUCCESS)	76	#define rpc_success cpu_to_be32(RPC_SUCCESS)
77	#define rpc_prog_unavail __constant_htonl(RPC_PROG_UNAVAIL)	77	#define rpc_prog_unavail cpu_to_be32(RPC_PROG_UNAVAIL)
78	#define rpc_prog_mismatch __constant_htonl(RPC_PROG_MISMATCH)	78	#define rpc_prog_mismatch cpu_to_be32(RPC_PROG_MISMATCH)
79	#define rpc_proc_unavail __constant_htonl(RPC_PROC_UNAVAIL)	79	#define rpc_proc_unavail cpu_to_be32(RPC_PROC_UNAVAIL)
80	#define rpc_garbage_args __constant_htonl(RPC_GARBAGE_ARGS)	80	#define rpc_garbage_args cpu_to_be32(RPC_GARBAGE_ARGS)
81	#define rpc_system_err __constant_htonl(RPC_SYSTEM_ERR)	81	#define rpc_system_err cpu_to_be32(RPC_SYSTEM_ERR)
82	#define rpc_drop_reply __constant_htonl(RPC_DROP_REPLY)	82	#define rpc_drop_reply cpu_to_be32(RPC_DROP_REPLY)
83		83
84	#define rpc_auth_ok __constant_htonl(RPC_AUTH_OK)	84	#define rpc_auth_ok cpu_to_be32(RPC_AUTH_OK)
85	#define rpc_autherr_badcred __constant_htonl(RPC_AUTH_BADCRED)	85	#define rpc_autherr_badcred cpu_to_be32(RPC_AUTH_BADCRED)
86	#define rpc_autherr_rejectedcred __constant_htonl(RPC_AUTH_REJECTEDCRED)	86	#define rpc_autherr_rejectedcred cpu_to_be32(RPC_AUTH_REJECTEDCRED)
87	#define rpc_autherr_badverf __constant_htonl(RPC_AUTH_BADVERF)	87	#define rpc_autherr_badverf cpu_to_be32(RPC_AUTH_BADVERF)
88	#define rpc_autherr_rejectedverf __constant_htonl(RPC_AUTH_REJECTEDVERF)	88	#define rpc_autherr_rejectedverf cpu_to_be32(RPC_AUTH_REJECTEDVERF)
89	#define rpc_autherr_tooweak __constant_htonl(RPC_AUTH_TOOWEAK)	89	#define rpc_autherr_tooweak cpu_to_be32(RPC_AUTH_TOOWEAK)
90	#define rpcsec_gsserr_credproblem __constant_htonl(RPCSEC_GSS_CREDPROBLEM)	90	#define rpcsec_gsserr_credproblem cpu_to_be32(RPCSEC_GSS_CREDPROBLEM)
91	#define rpcsec_gsserr_ctxproblem __constant_htonl(RPCSEC_GSS_CTXPROBLEM)	91	#define rpcsec_gsserr_ctxproblem cpu_to_be32(RPCSEC_GSS_CTXPROBLEM)
92	#define rpc_autherr_oldseqnum __constant_htonl(101)	92	#define rpc_autherr_oldseqnum cpu_to_be32(101)
93		93
94	/*	94	/*
95	* Miscellaneous XDR helper functions	95	* Miscellaneous XDR helper functions