diff options
| author | J. Bruce Fields | 2018-03-07 21:37:35 +0100 |
|---|---|---|
| committer | J. Bruce Fields | 2018-03-19 21:38:13 +0100 |
| commit | edcc8452a05ffd2d2c8574905660c9c2572af075 (patch) | |
| tree | 9b8f52a8bcb525c3d77bb401326f29d902541824 /fs/nfsd/nfs4xdr.c | |
| parent | lockd: make nlm_ntf_refcnt and nlm_ntf_wq static (diff) | |
| download | kernel-qcow2-linux-edcc8452a05ffd2d2c8574905660c9c2572af075.tar.gz kernel-qcow2-linux-edcc8452a05ffd2d2c8574905660c9c2572af075.tar.xz kernel-qcow2-linux-edcc8452a05ffd2d2c8574905660c9c2572af075.zip | |
nfsd: remove unsused "cp_consecutive" field
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4xdr.c')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index e502fd16246b..9f8ef2c6e508 100644 --- 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, ©->cp_src_pos); p = xdr_decode_hyper(p, ©->cp_dst_pos); p = xdr_decode_hyper(p, ©->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; } |