[pnfs] [PATCH 1/2] Update server to ignore seqid value per latest draft.

[Sager, Mike]

Signed-off-by: Mike Sager <sager at netapp.com>
---
 fs/nfsd/nfs4xdr.c |   20 +-------------------
 1 files changed, 1 insertions(+), 19 deletions(-)
 
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index d3ce4a7..636c8b0 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -437,9 +437,6 @@ nfsd4_decode_close(struct nfsd4_compoundargs *argp,
struct nfsd4_close *close)
        READ32(close->cl_stateid.si_generation);
        COPYMEM(&close->cl_stateid.si_opaque, sizeof(stateid_opaque_t));
 
-       if (argp->minorversion == 1 && close->cl_seqid != 0)
-               return nfserr_inval;
-
        DECODE_TAIL;
 }
 
@@ -558,20 +555,11 @@ nfsd4_decode_lock(struct nfsd4_compoundargs *argp,
struct nfsd4_lock *lock)
                READ32(lock->lk_new_owner.len);
                READ_BUF(lock->lk_new_owner.len);
                READMEM(lock->lk_new_owner.data,
lock->lk_new_owner.len);
-
-               if ((argp->minorversion == 1) &&
-                   (lock->lk_new_open_seqid !=0 ||
-                    lock->lk_new_lock_seqid != 0 ||
-                    !zero_clientid(&lock->lk_new_clientid)))
-                       return nfserr_inval;
        } else {
                READ_BUF(20);
                READ32(lock->lk_old_lock_stateid.si_generation);
                COPYMEM(&lock->lk_old_lock_stateid.si_opaque,
sizeof(stateid_opaque_t));
                READ32(lock->lk_old_lock_seqid);
-
-               if (argp->minorversion == 1 && lock->lk_old_lock_seqid
!=0)
-                       return nfserr_inval;
        }
 
        DECODE_TAIL;
@@ -614,9 +602,6 @@ nfsd4_decode_locku(struct nfsd4_compoundargs *argp,
struct nfsd4_locku *locku)
        READ64(locku->lu_offset);
        READ64(locku->lu_length);
 
-       if (argp->minorversion == 1 && locku->lu_seqid != 0)
-               return nfserr_inval;
-
        DECODE_TAIL;
 }
 
@@ -653,7 +638,7 @@ nfsd4_decode_open(struct nfsd4_compoundargs *argp,
struct nfsd4_open *open)
        READ32(open->op_owner.len);
 
        if ((argp->minorversion == 1) &&
-           (open->op_seqid != 0 || !zero_clientid(&open->op_clientid)))
+           (!zero_clientid(&open->op_clientid)))
                return nfserr_inval;
 
        /* owner, open_flag */
@@ -744,9 +729,6 @@ nfsd4_decode_open_downgrade(struct
nfsd4_compoundargs *argp, struct nfsd4_open_d
        READ32(open_down->od_share_access);
        READ32(open_down->od_share_deny);
 
-       if (argp->minorversion == 1 && open_down->od_seqid != 0)
-               return nfserr_inval;
-
        DECODE_TAIL;
 }
 
--
1.5.2.1
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://linux-nfs.org/pipermail/pnfs/attachments/20070912/d556f493/attachment.htm