[PATCH 05/11] SQUASHME pnfs-submit: rename pnfs_layout_type 5

[andros@netapp.com]

From: Andy Adamson <andros@netapp.com>

squash into pnfs_submit: layout helper functions

Signed-off-by: Andy Adamson <andros@netapp.com>
---
 fs/nfs/pnfs.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index fdc4028..a10143e 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -526,7 +526,7 @@ send_layoutget(struct inode *ino,
 	   struct nfs_open_context *ctx,
 	   struct nfs4_pnfs_layout_segment *range,
 	   struct pnfs_layout_segment **lsegpp,
-	   struct pnfs_layout_type *lo)
+	   struct pnfs_layout_hdr *lo)
 {
 	int status;
 	struct nfs_server *server = NFS_SERVER(ino);
@@ -789,7 +789,7 @@ cmp_layout(struct nfs4_pnfs_layout_segment *l1,
 }
 
 static void
-pnfs_insert_layout(struct pnfs_layout_type *lo,
+pnfs_insert_layout(struct pnfs_layout_hdr *lo,
 		   struct pnfs_layout_segment *lseg)
 {
 	struct pnfs_layout_segment *lp;
@@ -915,7 +915,7 @@ has_matching_lseg(struct pnfs_layout_segment *lseg,
  * lookup range in layout
  */
 static struct pnfs_layout_segment *
-pnfs_has_layout(struct pnfs_layout_type *lo,
+pnfs_has_layout(struct pnfs_layout_hdr *lo,
 		struct nfs4_pnfs_layout_segment *range)
 {
 	struct pnfs_layout_segment *lseg, *ret = NULL;
@@ -955,14 +955,14 @@ _pnfs_update_layout(struct inode *ino,
 		.length = NFS4_MAX_UINT64,
 	};
 	struct nfs_inode *nfsi = NFS_I(ino);
-	struct pnfs_layout_type *lo;
+	struct pnfs_layout_hdr *lo;
 	struct pnfs_layout_segment *lseg = NULL;
 
 	*lsegpp = NULL;
 	spin_lock(&ino->i_lock);
 	lo = pnfs_alloc_layout(ino);
 	if (lo == NULL) {
-		dprintk("%s ERROR: can't get pnfs_layout_type\n", __func__);
+		dprintk("%s ERROR: can't get pnfs_layout_hdr\n", __func__);
 		goto out_unlock;
 	}
 
@@ -1120,7 +1120,7 @@ out:
 int
 pnfs_layout_process(struct nfs4_pnfs_layoutget *lgp)
 {
-	struct pnfs_layout_type *lo = NFS_I(lgp->args.inode)->layout;
+	struct pnfs_layout_hdr *lo = NFS_I(lgp->args.inode)->layout;
 	struct nfs4_pnfs_layoutget_res *res = &lgp->res;
 	struct pnfs_layout_segment *lseg;
 	struct inode *ino = PNFS_INODE(lo);
-- 
1.6.2.5