From: Chuck Lever <chuck.lever@oracle.com>
Date: Wed, 4 Nov 2020 20:08:50 +0000 (-0500)
Subject: NFSD: Replace READ* macros in nfsd4_decode_renew()
X-Git-Tag: v5.10.220~718
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2cef1009f8e730e9dd5824d2ba3b5f984554c922;p=thirdparty%2Fkernel%2Fstable.git

NFSD: Replace READ* macros in nfsd4_decode_renew()

[ Upstream commit d12f90458dc8c11734ba44ec88f109bf8de86ff0 ]

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index adf4a6fb94d4c..51b59b369d726 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1272,15 +1272,7 @@ nfsd4_decode_rename(struct nfsd4_compoundargs *argp, struct nfsd4_rename *rename
 static __be32
 nfsd4_decode_renew(struct nfsd4_compoundargs *argp, clientid_t *clientid)
 {
-	DECODE_HEAD;
-
-	if (argp->minorversion >= 1)
-		return nfserr_notsupp;
-
-	READ_BUF(sizeof(clientid_t));
-	COPYMEM(clientid, sizeof(clientid_t));
-
-	DECODE_TAIL;
+	return nfsd4_decode_clientid4(argp, clientid);
 }
 
 static __be32