From: Andy Adamson <andros@xxxxxxxxxx>
squash into pnfs_submit: filelayout layout segment alloc and free
Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
---
fs/nfs/nfs4filelayout.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index eb9c907..0cfa21c 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -385,7 +385,7 @@ static void filelayout_free_fh_array(struct nfs4_filelayout_segment *fl);
static int
filelayout_set_layout(struct nfs4_filelayout *flo,
struct nfs4_filelayout_segment *fl,
- struct nfs4_pnfs_layoutget_res *lgr)
+ struct nfs4_layoutget_res *lgr)
{
uint32_t *p = (uint32_t *)lgr->layout.buf;
uint32_t nfl_util;
@@ -454,7 +454,7 @@ filelayout_set_layout(struct nfs4_filelayout *flo,
static struct pnfs_layout_segment *
filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid,
- struct nfs4_pnfs_layoutget_res *lgr)
+ struct nfs4_layoutget_res *lgr)
{
struct nfs4_filelayout *flo = FILE_LO(layoutid);
struct pnfs_layout_segment *lseg;
--
1.6.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
