NFSD: Replace READ* macros in nfsd4_decode_remove()

[ Upstream commit b7f5fbf219aecda98e32de305551e445f9438899 ]

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 6036f8d595efa7060e47fd217dbd8ce040a7721d..d4e1e3138739cf101a58cac8bc42350f4d570dbb 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1255,16 +1255,7 @@ nfsd4_decode_readdir(struct nfsd4_compoundargs *argp, struct nfsd4_readdir *read
 static __be32
 nfsd4_decode_remove(struct nfsd4_compoundargs *argp, struct nfsd4_remove *remove)
 {
-       DECODE_HEAD;
-
-       READ_BUF(4);
-       remove->rm_namelen = be32_to_cpup(p++);
-       READ_BUF(remove->rm_namelen);
-       SAVEMEM(remove->rm_name, remove->rm_namelen);
-       if ((status = check_filename(remove->rm_name, remove->rm_namelen)))
-               return status;
-
-       DECODE_TAIL;
+       return nfsd4_decode_component4(argp, &remove->rm_name, &remove->rm_namelen);
 }
 
 static __be32