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 fa08540..87c8fe0 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c @@ -317,7 +317,7 @@ filelayout_free_layout(struct pnfs_layout_hdr *lo) */ static int -filelayout_check_layout(struct pnfs_layout_type *lo, +filelayout_check_layout(struct pnfs_layout_hdr *lo, struct pnfs_layout_segment *lseg) { struct nfs4_filelayout_segment *fl = LSEG_LD_DATA(lseg); @@ -453,7 +453,7 @@ filelayout_set_layout(struct nfs4_filelayout *flo, } static struct pnfs_layout_segment * -filelayout_alloc_lseg(struct pnfs_layout_type *layoutid, +filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid, struct nfs4_pnfs_layoutget_res *lgr) { struct nfs4_filelayout *flo = FILE_LO(layoutid); -- 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