1 files changed, 7 insertions, 5 deletions

diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index 918ad647afe..726e59a9e50 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -488,17 +488,18 @@ static __be32 decode_recallany_args(struct svc_rqst *rqstp,
                                       struct xdr_stream *xdr,
                                       struct cb_recallanyargs *args)
 {
-        __be32 *p;
+        uint32_t bitmap[2];
+        __be32 *p, status;
 
         args->craa_addr = svc_addr(rqstp);
         p = read_buf(xdr, 4);
         if (unlikely(p == NULL))
                 return htonl(NFS4ERR_BADXDR);
         args->craa_objs_to_keep = ntohl(*p++);
-        p = read_buf(xdr, 4);
-        if (unlikely(p == NULL))
-                return htonl(NFS4ERR_BADXDR);
-        args->craa_type_mask = ntohl(*p);
+        status = decode_bitmap(xdr, bitmap);
+        if (unlikely(status))
+                return status;
+        args->craa_type_mask = bitmap[0];
 
         return 0;
 }
@@ -986,4 +987,5 @@ struct svc_version nfs4_callback_version4 = {
         .vs_proc = nfs4_callback_procedures1,
         .vs_xdrsize = NFS4_CALLBACK_XDRSIZE,
         .vs_dispatch = NULL,
+        .vs_hidden = 1,
 };