NFSD: Replace READ* macros in nfsd4_decode_reclaim_complete()
authorChuck Lever <chuck.lever@oracle.com>
Tue, 3 Nov 2020 20:02:11 +0000 (15:02 -0500)
committerChuck Lever <chuck.lever@oracle.com>
Mon, 30 Nov 2020 19:46:42 +0000 (14:46 -0500)
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
fs/nfsd/nfs4xdr.c

index c4da89a..59f89af 100644 (file)
@@ -1738,16 +1738,6 @@ nfsd4_decode_free_stateid(struct nfsd4_compoundargs *argp,
        return nfsd4_decode_stateid4(argp, &free_stateid->fr_stateid);
 }
 
-static __be32 nfsd4_decode_reclaim_complete(struct nfsd4_compoundargs *argp, struct nfsd4_reclaim_complete *rc)
-{
-       DECODE_HEAD;
-
-       READ_BUF(4);
-       rc->rca_one_fs = be32_to_cpup(p++);
-
-       DECODE_TAIL;
-}
-
 #ifdef CONFIG_NFSD_PNFS
 static __be32
 nfsd4_decode_getdeviceinfo(struct nfsd4_compoundargs *argp,
@@ -1904,6 +1894,14 @@ static __be32 nfsd4_decode_destroy_clientid(struct nfsd4_compoundargs *argp,
        return nfsd4_decode_clientid4(argp, &dc->clientid);
 }
 
+static __be32 nfsd4_decode_reclaim_complete(struct nfsd4_compoundargs *argp,
+                                           struct nfsd4_reclaim_complete *rc)
+{
+       if (xdr_stream_decode_bool(argp->xdr, &rc->rca_one_fs) < 0)
+               return nfserr_bad_xdr;
+       return nfs_ok;
+}
+
 static __be32
 nfsd4_decode_fallocate(struct nfsd4_compoundargs *argp,
                       struct nfsd4_fallocate *fallocate)