nfsd: remove unsused "cp_consecutive" field

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

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index a0bed2b2004db4fe0ef6de9ae8d2eec44928507a..40dfb759d38dece41129a91a4689a4545b42adce 100644 (file)
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1106,7 +1106,6 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        else {
                copy->cp_res.wr_bytes_written = bytes;
                copy->cp_res.wr_stable_how = NFS_UNSTABLE;
-               copy->cp_consecutive = 1;
                copy->cp_synchronous = 1;
                gen_boot_verifier(&copy->cp_res.wr_verifier, SVC_NET(rqstp));
                status = nfs_ok;

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index e502fd16246b8130d17e3f3eef72d8e0879e4596..9f8ef2c6e50886a78b79f2a8bd6d29452aa9dfa4 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1759,7 +1759,7 @@ nfsd4_decode_copy(struct nfsd4_compoundargs *argp, struct nfsd4_copy *copy)
        p = xdr_decode_hyper(p, &copy->cp_src_pos);
        p = xdr_decode_hyper(p, &copy->cp_dst_pos);
        p = xdr_decode_hyper(p, &copy->cp_count);
-       copy->cp_consecutive = be32_to_cpup(p++);
+       p++; /* ca_consecutive: we always do consecutive copies */
        copy->cp_synchronous = be32_to_cpup(p++);
        tmp = be32_to_cpup(p); /* Source server list not supported */
 
@@ -4214,7 +4214,7 @@ nfsd4_encode_copy(struct nfsd4_compoundres *resp, __be32 nfserr,
                return nfserr;
 
        p = xdr_reserve_space(&resp->xdr, 4 + 4);
-       *p++ = cpu_to_be32(copy->cp_consecutive);
+       *p++ = xdr_one; /* cr_consecutive */
        *p++ = cpu_to_be32(copy->cp_synchronous);
        return 0;
 }

diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index bc29511b6405275522a09db2c596991cdd99e710..7cbc129092fe325750b56685a0a849c9bd0b9000 100644 (file)
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -518,7 +518,6 @@ struct nfsd4_copy {
        u64             cp_count;
 
        /* both */
-       bool            cp_consecutive;
        bool            cp_synchronous;
 
        /* response */