Commit 5ba6a09e authored by Trond Myklebust's avatar Trond Myklebust

pNFS/flexfiles: Remove a redundant parameter in ff_layout_encode_ioerr()

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 65990d1a
...@@ -1946,8 +1946,7 @@ ff_layout_free_deviceid_node(struct nfs4_deviceid_node *d) ...@@ -1946,8 +1946,7 @@ ff_layout_free_deviceid_node(struct nfs4_deviceid_node *d)
id_node)); id_node));
} }
static int ff_layout_encode_ioerr(struct nfs4_flexfile_layout *flo, static int ff_layout_encode_ioerr(struct xdr_stream *xdr,
struct xdr_stream *xdr,
const struct nfs4_layoutreturn_args *args, const struct nfs4_layoutreturn_args *args,
const struct nfs4_flexfile_layoutreturn_args *ff_args) const struct nfs4_flexfile_layoutreturn_args *ff_args)
{ {
...@@ -2049,16 +2048,15 @@ ff_layout_encode_layoutreturn(struct xdr_stream *xdr, ...@@ -2049,16 +2048,15 @@ ff_layout_encode_layoutreturn(struct xdr_stream *xdr,
const struct nfs4_xdr_opaque_data *ff_opaque) const struct nfs4_xdr_opaque_data *ff_opaque)
{ {
const struct nfs4_layoutreturn_args *args = voidargs; const struct nfs4_layoutreturn_args *args = voidargs;
struct pnfs_layout_hdr *lo = args->layout; struct nfs4_flexfile_layoutreturn_args *ff_args = ff_opaque->data;
struct nfs4_flexfile_layout *flo = FF_LAYOUT_FROM_HDR(lo);
__be32 *start; __be32 *start;
dprintk("%s: Begin\n", __func__); dprintk("%s: Begin\n", __func__);
start = xdr_reserve_space(xdr, 4); start = xdr_reserve_space(xdr, 4);
BUG_ON(!start); BUG_ON(!start);
ff_layout_encode_ioerr(flo, xdr, args, ff_opaque->data); ff_layout_encode_ioerr(xdr, args, ff_args);
ff_layout_encode_iostats_array(xdr, args, ff_opaque->data); ff_layout_encode_iostats_array(xdr, args, ff_args);
*start = cpu_to_be32((xdr->p - start - 1) * 4); *start = cpu_to_be32((xdr->p - start - 1) * 4);
dprintk("%s: Return\n", __func__); dprintk("%s: Return\n", __func__);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment