From: Andy Adamson <andros@xxxxxxxxxx>
squash into pnfs_submit: layoutreturn helper functions
Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
---
fs/nfs/pnfs.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index a10143e..b9bf9d6 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -590,7 +590,7 @@ should_free_lseg(struct pnfs_layout_segment *lseg,
}
static struct pnfs_layout_segment *
-has_layout_to_return(struct pnfs_layout_type *lo,
+has_layout_to_return(struct pnfs_layout_hdr *lo,
struct nfs4_pnfs_layout_segment *range)
{
struct pnfs_layout_segment *out = NULL, *lseg;
@@ -674,7 +674,7 @@ pnfs_return_layout_barrier(struct nfs_inode *nfsi,
static int
return_layout(struct inode *ino, struct nfs4_pnfs_layout_segment *range,
- enum pnfs_layoutreturn_type type, struct pnfs_layout_type *lo,
+ enum pnfs_layoutreturn_type type, struct pnfs_layout_hdr *lo,
bool wait)
{
struct nfs4_pnfs_layoutreturn *lrp;
@@ -709,7 +709,7 @@ _pnfs_return_layout(struct inode *ino, struct nfs4_pnfs_layout_segment *range,
enum pnfs_layoutreturn_type type,
bool wait)
{
- struct pnfs_layout_type *lo = NULL;
+ struct pnfs_layout_hdr *lo = NULL;
struct nfs_inode *nfsi = NFS_I(ino);
struct nfs4_pnfs_layout_segment arg;
int status = 0;
--
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
