NFSv4: Remove bogus "struct nfs_client" argument from decode_ace()
authorTrond Myklebust <trond.myklebust@primarydata.com>
Sun, 19 Feb 2017 21:08:30 +0000 (16:08 -0500)
committerAnna Schumaker <Anna.Schumaker@Netapp.com>
Tue, 21 Feb 2017 21:56:16 +0000 (16:56 -0500)
We shouldn't need to force callers to carry an unused argument.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
fs/nfs/nfs4xdr.c

index 26808fbaacb0bbbef31753860dab7a0f49868f54..ec0d76712e43a9c9809db2069abf59a5c90f6d23 100644 (file)
@@ -3127,7 +3127,7 @@ static int decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)
 }
 
 /* Dummy routine */
-static int decode_ace(struct xdr_stream *xdr, void *ace, struct nfs_client *clp)
+static int decode_ace(struct xdr_stream *xdr, void *ace)
 {
        __be32 *p;
        unsigned int strlen;
@@ -5075,7 +5075,7 @@ static int decode_rw_delegation(struct xdr_stream *xdr,
                if (decode_space_limit(xdr, &res->pagemod_limit) < 0)
                                return -EIO;
        }
-       return decode_ace(xdr, NULL, res->server->nfs_client);
+       return decode_ace(xdr, NULL);
 out_overflow:
        print_overflow_msg(__func__, xdr);
        return -EIO;