mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 22:26:55 +00:00
Code Issues Releases Wiki Activity

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

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

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2020-11-16 17:25:02 -05:00
parent 5dcbfabb67
commit 144e826940
1 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
fs/nfsd/nfs4xdr.c
View file

@ -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)