From: Andy Adamson <andros@xxxxxxxxxx> squash into pnfs_submit: layoutget Signed-off-by: Andy Adamson <andros@xxxxxxxxxx> --- fs/nfs/pnfs.c | 2 +- fs/nfs/pnfs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 98f53c2..fdc4028 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -348,7 +348,7 @@ put_layout(struct inode *inode) } void -pnfs_layout_release(struct pnfs_layout_type *lo, +pnfs_layout_release(struct pnfs_layout_hdr *lo, struct nfs4_pnfs_layout_segment *range) { struct nfs_inode *nfsi = PNFS_NFS_INODE(lo); diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index 7da54fe..e39af4f 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -58,7 +58,7 @@ void pnfs_pageio_init_read(struct nfs_pageio_descriptor *, struct inode *, void pnfs_pageio_init_write(struct nfs_pageio_descriptor *, struct inode *); void pnfs_get_layout_done(struct nfs4_pnfs_layoutget *, int rpc_status); int pnfs_layout_process(struct nfs4_pnfs_layoutget *lgp); -void pnfs_layout_release(struct pnfs_layout_type *, struct nfs4_pnfs_layout_segment *range); +void pnfs_layout_release(struct pnfs_layout_hdr *, struct nfs4_pnfs_layout_segment *range); void pnfs_set_layout_stateid(struct pnfs_layout_hdr *lo, const nfs4_stateid *stateid); void pnfs_destroy_layout(struct nfs_inode *); -- 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