Merge tag 'sound-fix-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[deliverable/linux.git] / fs / nfs / nfs42xdr.c

diff --git a/fs/nfs/nfs42xdr.c b/fs/nfs/nfs42xdr.c
index a6bd27da6286f9fee14f0b087eddcc1ec437cdde..0eb29e14070d5890478eda0274814f007f3cf9c5 100644 (file)
--- a/fs/nfs/nfs42xdr.c
+++ b/fs/nfs/nfs42xdr.c
@@ -238,8 +238,7 @@ out_overflow:
        return -EIO;
 }
 
-static int decode_layoutstats(struct xdr_stream *xdr,
-                             struct nfs42_layoutstat_res *res)
+static int decode_layoutstats(struct xdr_stream *xdr)
 {
        return decode_op_hdr(xdr, OP_LAYOUTSTATS);
 }
@@ -343,7 +342,7 @@ static int nfs4_xdr_dec_layoutstats(struct rpc_rqst *rqstp,
                goto out;
        WARN_ON(res->num_dev > PNFS_LAYOUTSTATS_MAXDEV);
        for (i = 0; i < res->num_dev; i++) {
-               status = decode_layoutstats(xdr, res);
+               status = decode_layoutstats(xdr);
                if (status)
                        goto out;
        }