Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edcc8452 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd: remove unsused "cp_consecutive" field 



Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 554faf28

fs/nfsd/nfs4proc.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

fs/nfsd/nfs4xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

fs/nfsd/xdr4.h

+0 −1
Original line number Diff line number Diff line
@@ -518,7 +518,6 @@ struct nfsd4_copy { 
	u64		cp_count;



	/* both */

	bool		cp_consecutive;

	bool		cp_synchronous;



	/* response */