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

Commit d0b496d2 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Rename encode_stateid() to encode_open_stateid() 



The current version of encode_stateid really only applies to open stateids.
You can't use it for locks, delegations or layouts.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 36281caa

fs/nfs/nfs4xdr.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1528,7 +1528,7 @@ static void encode_putrootfh(struct xdr_stream *xdr, struct compound_hdr *hdr) 
	hdr->replen += decode_putrootfh_maxsz;

	hdr->replen += decode_putrootfh_maxsz;

}

}





static void encode_stateid(struct xdr_stream *xdr, const struct nfs_open_context *ctx, const struct nfs_lock_context *l_ctx, int zero_seqid)

static void encode_open_stateid(struct xdr_stream *xdr, const struct nfs_open_context *ctx, const struct nfs_lock_context *l_ctx, int zero_seqid)

{

{

	nfs4_stateid stateid;

	nfs4_stateid stateid;

	__be32 *p;

	__be32 *p;
@@ -1550,7 +1550,7 @@ static void encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args, 
	p = reserve_space(xdr, 4);

	p = reserve_space(xdr, 4);

	*p = cpu_to_be32(OP_READ);

	*p = cpu_to_be32(OP_READ);





	encode_stateid(xdr, args->context, args->lock_context,

	encode_open_stateid(xdr, args->context, args->lock_context,

		       hdr->minorversion);

		       hdr->minorversion);





	p = reserve_space(xdr, 12);

	p = reserve_space(xdr, 12);
@@ -1739,7 +1739,7 @@ static void encode_write(struct xdr_stream *xdr, const struct nfs_writeargs *arg 
	p = reserve_space(xdr, 4);

	p = reserve_space(xdr, 4);

	*p = cpu_to_be32(OP_WRITE);

	*p = cpu_to_be32(OP_WRITE);





	encode_stateid(xdr, args->context, args->lock_context,

	encode_open_stateid(xdr, args->context, args->lock_context,

		       hdr->minorversion);

		       hdr->minorversion);





	p = reserve_space(xdr, 16);

	p = reserve_space(xdr, 16);