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_open_downgrade()

Browse Source 
[ Upstream commit dca71651f097ea608945d7a66bf62761a630de9a ]

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-03 14:21:01 -05:00
committed by Greg Kroah-Hartman
parent e557a2eabb
commit ad1ea32c97
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fs/nfsd/nfs4xdr.c
View File

@@ -1172,21 +1172,19 @@ nfsd4_decode_open_confirm(struct nfsd4_compoundargs *argp, struct nfsd4_open_con
static __be32 static __be32
nfsd4_decode_open_downgrade(struct nfsd4_compoundargs *argp, struct nfsd4_open_downgrade *open_down) nfsd4_decode_open_downgrade(struct nfsd4_compoundargs *argp, struct nfsd4_open_downgrade *open_down)
{ {
DECODE_HEAD; __be32 status;
status = nfsd4_decode_stateid(argp, &open_down->od_stateid); status = nfsd4_decode_stateid4(argp, &open_down->od_stateid);
if (status) if (status)
return status; return status;
READ_BUF(4); if (xdr_stream_decode_u32(argp->xdr, &open_down->od_seqid) < 0)
open_down->od_seqid = be32_to_cpup(p++); return nfserr_bad_xdr;
/* deleg_want is ignored */
status = nfsd4_decode_share_access(argp, &open_down->od_share_access, status = nfsd4_decode_share_access(argp, &open_down->od_share_access,
&open_down->od_deleg_want, NULL); &open_down->od_deleg_want, NULL);
if (status) if (status)
return status; return status;
status = nfsd4_decode_share_deny(argp, &open_down->od_share_deny); return nfsd4_decode_share_deny(argp, &open_down->od_share_deny);
if (status)
return status;
DECODE_TAIL;
} }
static __be32 static __be32