diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-09-15 18:49:52 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-12-01 17:21:44 -0500 |
| commit | 94e5c571fccb8eb551d3d5f5d163bf0c253a6ed8 (patch) | |
| tree | 6c617e728ce6aff8f5003be492d672ec6843104d /fs/nfs/objlayout | |
| parent | 0cdc329ec9b150c165bcb603c4314b4031b24785 (diff) | |
| download | talos-obmc-linux-94e5c571fccb8eb551d3d5f5d163bf0c253a6ed8.tar.gz talos-obmc-linux-94e5c571fccb8eb551d3d5f5d163bf0c253a6ed8.zip | |
pNFS: Get rid of unnecessary layout parameter in encode_layoutreturn callback
The parameter is already present in the "args" structure.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/objlayout')
| -rw-r--r-- | fs/nfs/objlayout/objlayout.c | 4 | ||||
| -rw-r--r-- | fs/nfs/objlayout/objlayout.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfs/objlayout/objlayout.c b/fs/nfs/objlayout/objlayout.c index 919efd4a1a23..2a4cdce939a0 100644 --- a/fs/nfs/objlayout/objlayout.c +++ b/fs/nfs/objlayout/objlayout.c @@ -504,10 +504,10 @@ encode_accumulated_error(struct objlayout *objlay, __be32 *p) } void -objlayout_encode_layoutreturn(struct pnfs_layout_hdr *pnfslay, - struct xdr_stream *xdr, +objlayout_encode_layoutreturn(struct xdr_stream *xdr, const struct nfs4_layoutreturn_args *args) { + struct pnfs_layout_hdr *pnfslay = args->layout; struct objlayout *objlay = OBJLAYOUT(pnfslay); struct objlayout_io_res *oir, *tmp; __be32 *start; diff --git a/fs/nfs/objlayout/objlayout.h b/fs/nfs/objlayout/objlayout.h index 2641dbad345c..fc94a5872ed4 100644 --- a/fs/nfs/objlayout/objlayout.h +++ b/fs/nfs/objlayout/objlayout.h @@ -175,7 +175,6 @@ extern void objlayout_encode_layoutcommit( const struct nfs4_layoutcommit_args *); extern void objlayout_encode_layoutreturn( - struct pnfs_layout_hdr *, struct xdr_stream *, const struct nfs4_layoutreturn_args *); |
