1 files changed, 88 insertions, 83 deletions

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 14ba4d9b2859..afcdf4b76843 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -413,6 +413,18 @@ out_nfserr:
 }
 
 static __be32
+nfsd4_decode_stateid(struct nfsd4_compoundargs *argp, stateid_t *sid)
+{
+        DECODE_HEAD;
+
+        READ_BUF(sizeof(stateid_t));
+        READ32(sid->si_generation);
+        COPYMEM(&sid->si_opaque, sizeof(stateid_opaque_t));
+
+        DECODE_TAIL;
+}
+
+static __be32
 nfsd4_decode_access(struct nfsd4_compoundargs *argp, struct nfsd4_access *access)
 {
         DECODE_HEAD;
@@ -429,10 +441,9 @@ nfsd4_decode_close(struct nfsd4_compoundargs *argp, struct nfsd4_close *close)
         DECODE_HEAD;
 
         close->cl_stateowner = NULL;
-        READ_BUF(4 + sizeof(stateid_t));
+        READ_BUF(4);
         READ32(close->cl_seqid);
-        READ32(close->cl_stateid.si_generation);
-        COPYMEM(&close->cl_stateid.si_opaque, sizeof(stateid_opaque_t));
+        return nfsd4_decode_stateid(argp, &close->cl_stateid);
 
         DECODE_TAIL;
 }
@@ -493,13 +504,7 @@ nfsd4_decode_create(struct nfsd4_compoundargs *argp, struct nfsd4_create *create
 static inline __be32
 nfsd4_decode_delegreturn(struct nfsd4_compoundargs *argp, struct nfsd4_delegreturn *dr)
 {
-        DECODE_HEAD;
-
-        READ_BUF(sizeof(stateid_t));
-        READ32(dr->dr_stateid.si_generation);
-        COPYMEM(&dr->dr_stateid.si_opaque, sizeof(stateid_opaque_t));
-
-        DECODE_TAIL;
+        return nfsd4_decode_stateid(argp, &dr->dr_stateid);
 }
 
 static inline __be32
@@ -542,20 +547,22 @@ nfsd4_decode_lock(struct nfsd4_compoundargs *argp, struct nfsd4_lock *lock)
         READ32(lock->lk_is_new);
 
         if (lock->lk_is_new) {
-                READ_BUF(36);
+                READ_BUF(4);
                 READ32(lock->lk_new_open_seqid);
-                READ32(lock->lk_new_open_stateid.si_generation);
-
-                COPYMEM(&lock->lk_new_open_stateid.si_opaque, sizeof(stateid_opaque_t));
+                status = nfsd4_decode_stateid(argp, &lock->lk_new_open_stateid);
+                if (status)
+                        return status;
+                READ_BUF(8 + sizeof(clientid_t));
                 READ32(lock->lk_new_lock_seqid);
                 COPYMEM(&lock->lk_new_clientid, sizeof(clientid_t));
                 READ32(lock->lk_new_owner.len);
                 READ_BUF(lock->lk_new_owner.len);
                 READMEM(lock->lk_new_owner.data, lock->lk_new_owner.len);
         } else {
-                READ_BUF(20);
-                READ32(lock->lk_old_lock_stateid.si_generation);
-                COPYMEM(&lock->lk_old_lock_stateid.si_opaque, sizeof(stateid_opaque_t));
+                status = nfsd4_decode_stateid(argp, &lock->lk_old_lock_stateid);
+                if (status)
+                        return status;
+                READ_BUF(4);
                 READ32(lock->lk_old_lock_seqid);
         }
 
@@ -587,13 +594,15 @@ nfsd4_decode_locku(struct nfsd4_compoundargs *argp, struct nfsd4_locku *locku)
         DECODE_HEAD;
 
         locku->lu_stateowner = NULL;
-        READ_BUF(24 + sizeof(stateid_t));
+        READ_BUF(8);
         READ32(locku->lu_type);
         if ((locku->lu_type < NFS4_READ_LT) || (locku->lu_type > NFS4_WRITEW_LT))
                 goto xdr_error;
         READ32(locku->lu_seqid);
-        READ32(locku->lu_stateid.si_generation);
-        COPYMEM(&locku->lu_stateid.si_opaque, sizeof(stateid_opaque_t));
+        status = nfsd4_decode_stateid(argp, &locku->lu_stateid);
+        if (status)
+                return status;
+        READ_BUF(16);
         READ64(locku->lu_offset);
         READ64(locku->lu_length);
 
@@ -678,8 +687,10 @@ nfsd4_decode_open(struct nfsd4_compoundargs *argp, struct nfsd4_open *open)
                 READ32(open->op_delegate_type);
                 break;
         case NFS4_OPEN_CLAIM_DELEGATE_CUR:
-                READ_BUF(sizeof(stateid_t) + 4);
-                COPYMEM(&open->op_delegate_stateid, sizeof(stateid_t));
+                status = nfsd4_decode_stateid(argp, &open->op_delegate_stateid);
+                if (status)
+                        return status;
+                READ_BUF(4);
                 READ32(open->op_fname.len);
                 READ_BUF(open->op_fname.len);
                 SAVEMEM(open->op_fname.data, open->op_fname.len);
@@ -699,9 +710,10 @@ nfsd4_decode_open_confirm(struct nfsd4_compoundargs *argp, struct nfsd4_open_con
         DECODE_HEAD;
                     
         open_conf->oc_stateowner = NULL;
-        READ_BUF(4 + sizeof(stateid_t));
-        READ32(open_conf->oc_req_stateid.si_generation);
-        COPYMEM(&open_conf->oc_req_stateid.si_opaque, sizeof(stateid_opaque_t));
+        status = nfsd4_decode_stateid(argp, &open_conf->oc_req_stateid);
+        if (status)
+                return status;
+        READ_BUF(4);
         READ32(open_conf->oc_seqid);
                                                         
         DECODE_TAIL;
@@ -713,9 +725,10 @@ nfsd4_decode_open_downgrade(struct nfsd4_compoundargs *argp, struct nfsd4_open_d
         DECODE_HEAD;
                     
         open_down->od_stateowner = NULL;
-        READ_BUF(12 + sizeof(stateid_t));
-        READ32(open_down->od_stateid.si_generation);
-        COPYMEM(&open_down->od_stateid.si_opaque, sizeof(stateid_opaque_t));
+        status = nfsd4_decode_stateid(argp, &open_down->od_stateid);
+        if (status)
+                return status;
+        READ_BUF(12);
         READ32(open_down->od_seqid);
         READ32(open_down->od_share_access);
         READ32(open_down->od_share_deny);
@@ -743,9 +756,10 @@ nfsd4_decode_read(struct nfsd4_compoundargs *argp, struct nfsd4_read *read)
 {
         DECODE_HEAD;
 
-        READ_BUF(sizeof(stateid_t) + 12);
-        READ32(read->rd_stateid.si_generation);
-        COPYMEM(&read->rd_stateid.si_opaque, sizeof(stateid_opaque_t));
+        status = nfsd4_decode_stateid(argp, &read->rd_stateid);
+        if (status)
+                return status;
+        READ_BUF(12);
         READ64(read->rd_offset);
         READ32(read->rd_length);
 
@@ -834,15 +848,13 @@ nfsd4_decode_secinfo(struct nfsd4_compoundargs *argp,
 static __be32
 nfsd4_decode_setattr(struct nfsd4_compoundargs *argp, struct nfsd4_setattr *setattr)
 {
-        DECODE_HEAD;
-
-        READ_BUF(sizeof(stateid_t));
-        READ32(setattr->sa_stateid.si_generation);
-        COPYMEM(&setattr->sa_stateid.si_opaque, sizeof(stateid_opaque_t));
-        if ((status = nfsd4_decode_fattr(argp, setattr->sa_bmval, &setattr->sa_iattr, &setattr->sa_acl)))
-                goto out;
+        __be32 status;
 
-        DECODE_TAIL;
+        status = nfsd4_decode_stateid(argp, &setattr->sa_stateid);
+        if (status)
+                return status;
+        return nfsd4_decode_fattr(argp, setattr->sa_bmval,
+                                  &setattr->sa_iattr, &setattr->sa_acl);
 }
 
 static __be32
@@ -927,9 +939,10 @@ nfsd4_decode_write(struct nfsd4_compoundargs *argp, struct nfsd4_write *write)
         int len;
         DECODE_HEAD;
 
-        READ_BUF(sizeof(stateid_opaque_t) + 20);
-        READ32(write->wr_stateid.si_generation);
-        COPYMEM(&write->wr_stateid.si_opaque, sizeof(stateid_opaque_t));
+        status = nfsd4_decode_stateid(argp, &write->wr_stateid);
+        if (status)
+                return status;
+        READ_BUF(16);
         READ64(write->wr_offset);
         READ32(write->wr_stable_how);
         if (write->wr_stable_how > 2)
@@ -1183,7 +1196,6 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
  * Header routine to setup seqid operation replay cache
  */
 #define ENCODE_SEQID_OP_HEAD                                    \
-        __be32 *p;                                              \
         __be32 *save;                                           \
                                                                 \
         save = resp->p;
@@ -1950,6 +1962,17 @@ fail:
         return -EINVAL;
 }
 
+static void
+nfsd4_encode_stateid(struct nfsd4_compoundres *resp, stateid_t *sid)
+{
+        ENCODE_HEAD;
+
+        RESERVE_SPACE(sizeof(stateid_t));
+        WRITE32(sid->si_generation);
+        WRITEMEM(&sid->si_opaque, sizeof(stateid_opaque_t));
+        ADJUST_ARGS();
+}
+
 static __be32
 nfsd4_encode_access(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_access *access)
 {
@@ -1969,12 +1992,9 @@ nfsd4_encode_close(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_c
 {
         ENCODE_SEQID_OP_HEAD;
 
-        if (!nfserr) {
-                RESERVE_SPACE(sizeof(stateid_t));
-                WRITE32(close->cl_stateid.si_generation);
-                WRITEMEM(&close->cl_stateid.si_opaque, sizeof(stateid_opaque_t));
-                ADJUST_ARGS();
-        }
+        if (!nfserr)
+                nfsd4_encode_stateid(resp, &close->cl_stateid);
+
         ENCODE_SEQID_OP_TAIL(close->cl_stateowner);
         return nfserr;
 }
@@ -2074,12 +2094,9 @@ nfsd4_encode_lock(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_lo
 {
         ENCODE_SEQID_OP_HEAD;
 
-        if (!nfserr) {
-                RESERVE_SPACE(4 + sizeof(stateid_t));
-                WRITE32(lock->lk_resp_stateid.si_generation);
-                WRITEMEM(&lock->lk_resp_stateid.si_opaque, sizeof(stateid_opaque_t));
-                ADJUST_ARGS();
-        } else if (nfserr == nfserr_denied)
+        if (!nfserr)
+                nfsd4_encode_stateid(resp, &lock->lk_resp_stateid);
+        else if (nfserr == nfserr_denied)
                 nfsd4_encode_lock_denied(resp, &lock->lk_denied);
 
         ENCODE_SEQID_OP_TAIL(lock->lk_replay_owner);
@@ -2099,13 +2116,9 @@ nfsd4_encode_locku(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_l
 {
         ENCODE_SEQID_OP_HEAD;
 
-        if (!nfserr) {
-                RESERVE_SPACE(sizeof(stateid_t));
-                WRITE32(locku->lu_stateid.si_generation);
-                WRITEMEM(&locku->lu_stateid.si_opaque, sizeof(stateid_opaque_t));
-                ADJUST_ARGS();
-        }
-                                        
+        if (!nfserr)
+                nfsd4_encode_stateid(resp, &locku->lu_stateid);
+
         ENCODE_SEQID_OP_TAIL(locku->lu_stateowner);
         return nfserr;
 }
@@ -2128,14 +2141,14 @@ nfsd4_encode_link(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_li
 static __be32
 nfsd4_encode_open(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_open *open)
 {
+        ENCODE_HEAD;
         ENCODE_SEQID_OP_HEAD;
 
         if (nfserr)
                 goto out;
 
-        RESERVE_SPACE(36 + sizeof(stateid_t));
-        WRITE32(open->op_stateid.si_generation);
-        WRITEMEM(&open->op_stateid.si_opaque, sizeof(stateid_opaque_t));
+        nfsd4_encode_stateid(resp, &open->op_stateid);
+        RESERVE_SPACE(40);
         WRITECINFO(open->op_cinfo);
         WRITE32(open->op_rflags);
         WRITE32(2);
@@ -2148,8 +2161,8 @@ nfsd4_encode_open(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_op
         case NFS4_OPEN_DELEGATE_NONE:
                 break;
         case NFS4_OPEN_DELEGATE_READ:
-                RESERVE_SPACE(20 + sizeof(stateid_t));
-                WRITEMEM(&open->op_delegate_stateid, sizeof(stateid_t));
+                nfsd4_encode_stateid(resp, &open->op_delegate_stateid);
+                RESERVE_SPACE(20);
                 WRITE32(open->op_recall);
 
                 /*
@@ -2162,8 +2175,8 @@ nfsd4_encode_open(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_op
                 ADJUST_ARGS();
                 break;
         case NFS4_OPEN_DELEGATE_WRITE:
-                RESERVE_SPACE(32 + sizeof(stateid_t));
-                WRITEMEM(&open->op_delegate_stateid, sizeof(stateid_t));
+                nfsd4_encode_stateid(resp, &open->op_delegate_stateid);
+                RESERVE_SPACE(32);
                 WRITE32(0);
 
                 /*
@@ -2195,13 +2208,9 @@ static __be32
 nfsd4_encode_open_confirm(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_open_confirm *oc)
 {
         ENCODE_SEQID_OP_HEAD;
-                                        
-        if (!nfserr) {
-                RESERVE_SPACE(sizeof(stateid_t));
-                WRITE32(oc->oc_resp_stateid.si_generation);
-                WRITEMEM(&oc->oc_resp_stateid.si_opaque, sizeof(stateid_opaque_t));
-                ADJUST_ARGS();
-        }
+
+        if (!nfserr)
+                nfsd4_encode_stateid(resp, &oc->oc_resp_stateid);
 
         ENCODE_SEQID_OP_TAIL(oc->oc_stateowner);
         return nfserr;
@@ -2211,13 +2220,9 @@ static __be32
 nfsd4_encode_open_downgrade(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_open_downgrade *od)
 {
         ENCODE_SEQID_OP_HEAD;
-                                        
-        if (!nfserr) {
-                RESERVE_SPACE(sizeof(stateid_t));
-                WRITE32(od->od_stateid.si_generation);
-                WRITEMEM(&od->od_stateid.si_opaque, sizeof(stateid_opaque_t));
-                ADJUST_ARGS();
-        }
+
+        if (!nfserr)
+                nfsd4_encode_stateid(resp, &od->od_stateid);
 
         ENCODE_SEQID_OP_TAIL(od->od_stateowner);
         return nfserr;