openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFSD: Replace READ* macros in nfsd4_decode_lock() 

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2020-11-03 13:29:27 -05:00
parent 8918cc0d2b
commit 7c59deed5c
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fs/nfsd/nfs4xdr.c
View File

@ -878,21 +878,17 @@ nfsd4_decode_locker4(struct nfsd4_compoundargs *argp, struct nfsd4_lock *lock)
static __be32
nfsd4_decode_lock(struct nfsd4_compoundargs *argp, struct nfsd4_lock *lock)
{
DECODE_HEAD;
/*
* type, reclaim(boolean), offset, length, new_lock_owner(boolean)
*/
READ_BUF(28);
lock->lk_type = be32_to_cpup(p++);
if (xdr_stream_decode_u32(argp->xdr, &lock->lk_type) < 0)
return nfserr_bad_xdr;
if ((lock->lk_type < NFS4_READ_LT) || (lock->lk_type > NFS4_WRITEW_LT))
goto xdr_error;
lock->lk_reclaim = be32_to_cpup(p++);
p = xdr_decode_hyper(p, &lock->lk_offset);
p = xdr_decode_hyper(p, &lock->lk_length);
status = nfsd4_decode_locker4(argp, lock);
DECODE_TAIL;
return nfserr_bad_xdr;
if (xdr_stream_decode_bool(argp->xdr, &lock->lk_reclaim) < 0)
return nfserr_bad_xdr;
if (xdr_stream_decode_u64(argp->xdr, &lock->lk_offset) < 0)
return nfserr_bad_xdr;
if (xdr_stream_decode_u64(argp->xdr, &lock->lk_length) < 0)
return nfserr_bad_xdr;
return nfsd4_decode_locker4(argp, lock);
}
static __be32