nfsd4: kill READ32

While we're here, let's kill off a couple of the read-side macros.

Leaving the more complicated ones alone for now.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

1 files changed, 127 insertions, 128 deletions

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index a7268b4a4954..a23fa002e0d0 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -98,7 +98,6 @@ xdr_error:					\
         status = nfserr_bad_xdr;                \
         goto out
 
-#define READ32(x)         (x) = ntohl(*p++)
 #define READ64(x)         do {                  \
         (x) = (u64)ntohl(*p++) << 32;           \
         (x) |= ntohl(*p++);                     \
@@ -248,17 +247,17 @@ nfsd4_decode_bitmap(struct nfsd4_compoundargs *argp, u32 *bmval)
         bmval[2] = 0;
 
         READ_BUF(4);
-        READ32(bmlen);
+        bmlen = be32_to_cpup(p++);
         if (bmlen > 1000)
                 goto xdr_error;
 
         READ_BUF(bmlen << 2);
         if (bmlen > 0)
-                READ32(bmval[0]);
+                bmval[0] = be32_to_cpup(p++);
         if (bmlen > 1)
-                READ32(bmval[1]);
+                bmval[1] = be32_to_cpup(p++);
         if (bmlen > 2)
-                READ32(bmval[2]);
+                bmval[2] = be32_to_cpup(p++);
 
         DECODE_TAIL;
 }
@@ -278,7 +277,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
                 return status;
 
         READ_BUF(4);
-        READ32(expected_len);
+        expected_len = be32_to_cpup(p++);
 
         if (bmval[0] & FATTR4_WORD0_SIZE) {
                 READ_BUF(8);
@@ -291,7 +290,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
                 struct nfs4_ace *ace;
 
                 READ_BUF(4); len += 4;
-                READ32(nace);
+                nace = be32_to_cpup(p++);
 
                 if (nace > NFS4_ACL_MAX)
                         return nfserr_fbig;
@@ -305,10 +304,10 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
                 (*acl)->naces = nace;
                 for (ace = (*acl)->aces; ace < (*acl)->aces + nace; ace++) {
                         READ_BUF(16); len += 16;
-                        READ32(ace->type);
-                        READ32(ace->flag);
-                        READ32(ace->access_mask);
-                        READ32(dummy32);
+                        ace->type = be32_to_cpup(p++);
+                        ace->flag = be32_to_cpup(p++);
+                        ace->access_mask = be32_to_cpup(p++);
+                        dummy32 = be32_to_cpup(p++);
                         READ_BUF(dummy32);
                         len += XDR_QUADLEN(dummy32) << 2;
                         READMEM(buf, dummy32);
@@ -330,14 +329,14 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
         if (bmval[1] & FATTR4_WORD1_MODE) {
                 READ_BUF(4);
                 len += 4;
-                READ32(iattr->ia_mode);
+                iattr->ia_mode = be32_to_cpup(p++);
                 iattr->ia_mode &= (S_IFMT | S_IALLUGO);
                 iattr->ia_valid |= ATTR_MODE;
         }
         if (bmval[1] & FATTR4_WORD1_OWNER) {
                 READ_BUF(4);
                 len += 4;
-                READ32(dummy32);
+                dummy32 = be32_to_cpup(p++);
                 READ_BUF(dummy32);
                 len += (XDR_QUADLEN(dummy32) << 2);
                 READMEM(buf, dummy32);
@@ -348,7 +347,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
         if (bmval[1] & FATTR4_WORD1_OWNER_GROUP) {
                 READ_BUF(4);
                 len += 4;
-                READ32(dummy32);
+                dummy32 = be32_to_cpup(p++);
                 READ_BUF(dummy32);
                 len += (XDR_QUADLEN(dummy32) << 2);
                 READMEM(buf, dummy32);
@@ -359,7 +358,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
         if (bmval[1] & FATTR4_WORD1_TIME_ACCESS_SET) {
                 READ_BUF(4);
                 len += 4;
-                READ32(dummy32);
+                dummy32 = be32_to_cpup(p++);
                 switch (dummy32) {
                 case NFS4_SET_TO_CLIENT_TIME:
                         /* We require the high 32 bits of 'seconds' to be 0, and we ignore
@@ -367,7 +366,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
                         READ_BUF(12);
                         len += 12;
                         READ64(iattr->ia_atime.tv_sec);
-                        READ32(iattr->ia_atime.tv_nsec);
+                        iattr->ia_atime.tv_nsec = be32_to_cpup(p++);
                         if (iattr->ia_atime.tv_nsec >= (u32)1000000000)
                                 return nfserr_inval;
                         iattr->ia_valid |= (ATTR_ATIME | ATTR_ATIME_SET);
@@ -382,7 +381,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
         if (bmval[1] & FATTR4_WORD1_TIME_MODIFY_SET) {
                 READ_BUF(4);
                 len += 4;
-                READ32(dummy32);
+                dummy32 = be32_to_cpup(p++);
                 switch (dummy32) {
                 case NFS4_SET_TO_CLIENT_TIME:
                         /* We require the high 32 bits of 'seconds' to be 0, and we ignore
@@ -390,7 +389,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
                         READ_BUF(12);
                         len += 12;
                         READ64(iattr->ia_mtime.tv_sec);
-                        READ32(iattr->ia_mtime.tv_nsec);
+                        iattr->ia_mtime.tv_nsec = be32_to_cpup(p++);
                         if (iattr->ia_mtime.tv_nsec >= (u32)1000000000)
                                 return nfserr_inval;
                         iattr->ia_valid |= (ATTR_MTIME | ATTR_MTIME_SET);
@@ -408,13 +407,13 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
         if (bmval[2] & FATTR4_WORD2_SECURITY_LABEL) {
                 READ_BUF(4);
                 len += 4;
-                READ32(dummy32); /* lfs: we don't use it */
+                dummy32 = be32_to_cpup(p++); /* lfs: we don't use it */
                 READ_BUF(4);
                 len += 4;
-                READ32(dummy32); /* pi: we don't use it either */
+                dummy32 = be32_to_cpup(p++); /* pi: we don't use it either */
                 READ_BUF(4);
                 len += 4;
-                READ32(dummy32);
+                dummy32 = be32_to_cpup(p++);
                 READ_BUF(dummy32);
                 if (dummy32 > NFSD4_MAX_SEC_LABEL_LEN)
                         return nfserr_badlabel;
@@ -445,7 +444,7 @@ nfsd4_decode_stateid(struct nfsd4_compoundargs *argp, stateid_t *sid)
         DECODE_HEAD;
 
         READ_BUF(sizeof(stateid_t));
-        READ32(sid->si_generation);
+        sid->si_generation = be32_to_cpup(p++);
         COPYMEM(&sid->si_opaque, sizeof(stateid_opaque_t));
 
         DECODE_TAIL;
@@ -457,7 +456,7 @@ nfsd4_decode_access(struct nfsd4_compoundargs *argp, struct nfsd4_access *access
         DECODE_HEAD;
 
         READ_BUF(4);
-        READ32(access->ac_req_access);
+        access->ac_req_access = be32_to_cpup(p++);
 
         DECODE_TAIL;
 }
@@ -472,7 +471,7 @@ static __be32 nfsd4_decode_cb_sec(struct nfsd4_compoundargs *argp, struct nfsd4_
 
         /* callback_sec_params4 */
         READ_BUF(4);
-        READ32(nr_secflavs);
+        nr_secflavs = be32_to_cpup(p++);
         if (nr_secflavs)