Commit 144e8269 authored by Chuck Lever's avatar Chuck Lever
Browse files

NFSD: Add helpers to decode a clientid4 and an NFSv4 state owner 



These helpers will also be used to simplify decoders in subsequent
patches.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 5dcbfabb

fs/nfsd/nfs4xdr.c

+29 −5
Original line number Diff line number Diff line
@@ -609,6 +609,30 @@ nfsd4_decode_stateid4(struct nfsd4_compoundargs *argp, stateid_t *sid) 
	return nfs_ok;

}



static __be32

nfsd4_decode_clientid4(struct nfsd4_compoundargs *argp, clientid_t *clientid)

{

	__be32 *p;



	p = xdr_inline_decode(argp->xdr, sizeof(__be64));

	if (!p)

		return nfserr_bad_xdr;

	memcpy(clientid, p, sizeof(*clientid));

	return nfs_ok;

}



static __be32

nfsd4_decode_state_owner4(struct nfsd4_compoundargs *argp,

			  clientid_t *clientid, struct xdr_netobj *owner)

{

	__be32 status;



	status = nfsd4_decode_clientid4(argp, clientid);

	if (status)

		return status;

	return nfsd4_decode_opaque(argp, owner);

}



static __be32 nfsd4_decode_cb_sec(struct nfsd4_compoundargs *argp, struct nfsd4_cb_sec *cbs)

{

	DECODE_HEAD;
@@ -832,12 +856,12 @@ nfsd4_decode_lock(struct nfsd4_compoundargs *argp, struct nfsd4_lock *lock) 
		status = nfsd4_decode_stateid(argp, &lock->lk_new_open_stateid);

		if (status)

			return status;

		READ_BUF(8 + sizeof(clientid_t));

		READ_BUF(4);

		lock->lk_new_lock_seqid = be32_to_cpup(p++);

		COPYMEM(&lock->lk_new_clientid, sizeof(clientid_t));

		lock->lk_new_owner.len = be32_to_cpup(p++);

		READ_BUF(lock->lk_new_owner.len);

		READMEM(lock->lk_new_owner.data, lock->lk_new_owner.len);

		status = nfsd4_decode_state_owner4(argp, &lock->lk_new_clientid,

						   &lock->lk_new_owner);

		if (status)

			return status;

	} else {

		status = nfsd4_decode_stateid(argp, &lock->lk_old_lock_stateid);

		if (status)