xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFSD: Replace READ* macros in nfsd4_decode_share_access()

Browse Source 
[ Upstream commit 9aa62f5199749b274454b6d7d914c9b2a5e77031 ]

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chuck Lever
2020-11-16 17:54:48 -05:00
committed by Greg Kroah-Hartman
parent 070df4a4e9
commit fa60cc6971
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfsd/nfs4xdr.c
View File

@@ -1012,11 +1012,10 @@ nfsd4_decode_openflag4(struct nfsd4_compoundargs *argp, struct nfsd4_open *open)
static __be32 nfsd4_decode_share_access(struct nfsd4_compoundargs *argp, u32 *share_access, u32 *deleg_want, u32 *deleg_when) static __be32 nfsd4_decode_share_access(struct nfsd4_compoundargs *argp, u32 *share_access, u32 *deleg_want, u32 *deleg_when)
{ {
__be32 *p;
u32 w; u32 w;
READ_BUF(4); if (xdr_stream_decode_u32(argp->xdr, &w) < 0)
w = be32_to_cpup(p++); return nfserr_bad_xdr;
*share_access = w & NFS4_SHARE_ACCESS_MASK; *share_access = w & NFS4_SHARE_ACCESS_MASK;
*deleg_want = w & NFS4_SHARE_WANT_MASK; *deleg_want = w & NFS4_SHARE_WANT_MASK;
if (deleg_when) if (deleg_when)
@@ -1059,7 +1058,6 @@ static __be32 nfsd4_decode_share_access(struct nfsd4_compoundargs *argp, u32 *sh
NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED): NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED):
return nfs_ok; return nfs_ok;
} }
xdr_error:
return nfserr_bad_xdr; return nfserr_bad_xdr;
} }