[PATCH 0/11] pnfs-submit rename pnfs_layout_type

[PATCH 0/11] pnfs-submit rename pnfs_layout_type

[andros]

The pnfs_layout_type structure is the header of the per-inode layout segment
list. Rename to pnfs_layout_hdr

-->Andy

[PATCH 01/11] SQUASHME pnfs-submit: rename pnfs_layout_type 1

[andros]

From: Andy Adamson <andros@netapp.com>

squash into pnfs_submit: layout header alloc,reference, and destroy

Signed-off-by: Andy Adamson <andros@netapp.com>
---
 fs/nfs/pnfs.c             |   32 ++++++++++++++++----------------
 fs/nfs/pnfs.h             |    4 ++--
 include/linux/nfs4_pnfs.h |   16 ++++++++--------
 include/linux/nfs_fs.h    |    4 ++--
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 393855e..bf86975 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -57,9 +57,9 @@
 
 static int pnfs_initialized;
 
-static void pnfs_free_layout(struct pnfs_layout_type *lo,
+static void pnfs_free_layout(struct pnfs_layout_hdr *lo,
 			     struct nfs4_pnfs_layout_segment *range);
-static inline void get_layout(struct pnfs_layout_type *lo);
+static inline void get_layout(struct pnfs_layout_hdr *lo);
 
 /* Locking:
  *
@@ -314,14 +314,14 @@ pnfs_unregister_layoutdriver(struct pnfs_layoutdriver_type *ld_type)
 #endif /* CONFIG_SMP */
 
 static inline void
-get_layout(struct pnfs_layout_type *lo)
+get_layout(struct pnfs_layout_hdr *lo)
 {
 	BUG_ON_UNLOCKED_LO(lo);
 	lo->refcount++;
 }
 
 static inline void
-put_layout_locked(struct pnfs_layout_type *lo)
+put_layout_locked(struct pnfs_layout_hdr *lo)
 {
 	BUG_ON_UNLOCKED_LO(lo);
 	BUG_ON(lo->refcount <= 0);
@@ -368,7 +368,7 @@ pnfs_layout_release(struct pnfs_layout_type *lo,
 void
 pnfs_destroy_layout(struct nfs_inode *nfsi)
 {
-	struct pnfs_layout_type *lo;
+	struct pnfs_layout_hdr *lo;
 	struct nfs4_pnfs_layout_segment range = {
 		.iomode = IOMODE_ANY,
 		.offset = 0,
@@ -400,10 +400,10 @@ pnfs_destroy_layout(struct nfs_inode *nfsi)
 void
 pnfs_destroy_all_layouts(struct nfs_client *clp)
 {
-	struct pnfs_layout_type *lo;
+	struct pnfs_layout_hdr *lo;
 
 	while (!list_empty(&clp->cl_layouts)) {
-		lo = list_entry(clp->cl_layouts.next, struct pnfs_layout_type,
+		lo = list_entry(clp->cl_layouts.next, struct pnfs_layout_hdr,
 				lo_layouts);
 		dprintk("%s freeing layout for inode %lu\n", __func__,
 			lo->lo_inode->i_ino);
@@ -472,7 +472,7 @@ put_lseg(struct pnfs_layout_segment *lseg)
 EXPORT_SYMBOL(put_lseg);
 
 void
-pnfs_set_layout_stateid(struct pnfs_layout_type *lo,
+pnfs_set_layout_stateid(struct pnfs_layout_hdr *lo,
 			const nfs4_stateid *stateid)
 {
 	write_seqlock(&lo->seqlock);
@@ -481,7 +481,7 @@ pnfs_set_layout_stateid(struct pnfs_layout_type *lo,
 }
 
 void
-pnfs_get_layout_stateid(nfs4_stateid *dst, struct pnfs_layout_type *lo)
+pnfs_get_layout_stateid(nfs4_stateid *dst, struct pnfs_layout_hdr *lo)
 {
 	int seq;
 
@@ -497,7 +497,7 @@ pnfs_get_layout_stateid(nfs4_stateid *dst, struct pnfs_layout_type *lo)
 }
 
 static void
-pnfs_layout_from_open_stateid(struct pnfs_layout_type *lo,
+pnfs_layout_from_open_stateid(struct pnfs_layout_hdr *lo,
 			      struct nfs4_state *state)
 {
 	int seq;
@@ -616,7 +616,7 @@ _pnfs_can_return_lseg(struct pnfs_layout_segment *lseg)
 
 
 static void
-pnfs_free_layout(struct pnfs_layout_type *lo,
+pnfs_free_layout(struct pnfs_layout_hdr *lo,
 		 struct nfs4_pnfs_layout_segment *range)
 {
 	struct pnfs_layout_segment *lseg, *next;
@@ -833,14 +833,14 @@ pnfs_insert_layout(struct pnfs_layout_type *lo,
 }
 
 /*
- * Each layoutdriver embeds pnfs_layout_type as the first field in it's
+ * Each layoutdriver embeds pnfs_layout_hdr as the first field in it's
  * per-layout type layout cache structure and returns it ZEROed
  * from layoutdriver_io_ops->alloc_layout
  */
-static struct pnfs_layout_type *
+static struct pnfs_layout_hdr *
 alloc_init_layout(struct inode *ino)
 {
-	struct pnfs_layout_type *lo;
+	struct pnfs_layout_hdr *lo;
 	struct layoutdriver_io_operations *io_ops;
 
 	io_ops = NFS_SERVER(ino)->pnfs_curr_ld->ld_io_ops;
@@ -864,11 +864,11 @@ alloc_init_layout(struct inode *ino)
  *
  * ino->i_lock must be taken by the caller.
  */
-static struct pnfs_layout_type *
+static struct pnfs_layout_hdr *
 pnfs_alloc_layout(struct inode *ino)
 {
 	struct nfs_inode *nfsi = NFS_I(ino);
-	struct pnfs_layout_type *new = NULL;
+	struct pnfs_layout_hdr *new = NULL;
 
 	dprintk("%s Begin ino=%p layout=%p\n", __func__, ino, nfsi->layout);
 
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 80f67c7..7da54fe 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -59,12 +59,12 @@ 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_set_layout_stateid(struct pnfs_layout_type *lo,
+void pnfs_set_layout_stateid(struct pnfs_layout_hdr *lo,
 			     const nfs4_stateid *stateid);
 void pnfs_destroy_layout(struct nfs_inode *);
 void pnfs_destroy_all_layouts(struct nfs_client *);
 void put_layout(struct inode *inode);
-void pnfs_get_layout_stateid(nfs4_stateid *dst, struct pnfs_layout_type *lo);
+void pnfs_get_layout_stateid(nfs4_stateid *dst, struct pnfs_layout_hdr *lo);
 
 #define PNFS_EXISTS_LDIO_OP(srv, opname) ((srv)->pnfs_curr_ld &&	\
 				     (srv)->pnfs_curr_ld->ld_io_ops &&	\
diff --git a/include/linux/nfs4_pnfs.h b/include/linux/nfs4_pnfs.h
index ef160e6..59a1a12 100644
--- a/include/linux/nfs4_pnfs.h
+++ b/include/linux/nfs4_pnfs.h
@@ -31,31 +31,31 @@ struct pnfs_layoutdriver_type {
 #if defined(CONFIG_NFS_V4_1)
 
 static inline struct nfs_inode *
-PNFS_NFS_INODE(struct pnfs_layout_type *lo)
+PNFS_NFS_INODE(struct pnfs_layout_hdr *lo)
 {
 	return NFS_I(lo->lo_inode);
 }
 
 static inline struct inode *
-PNFS_INODE(struct pnfs_layout_type *lo)
+PNFS_INODE(struct pnfs_layout_hdr *lo)
 {
 	return lo->lo_inode;
 }
 
 static inline struct nfs_server *
-PNFS_NFS_SERVER(struct pnfs_layout_type *lo)
+PNFS_NFS_SERVER(struct pnfs_layout_hdr *lo)
 {
 	return NFS_SERVER(PNFS_INODE(lo));
 }
 
 static inline struct pnfs_layoutdriver_type *
-PNFS_LD(struct pnfs_layout_type *lo)
+PNFS_LD(struct pnfs_layout_hdr *lo)
 {
 	return NFS_SERVER(PNFS_INODE(lo))->pnfs_curr_ld;
 }
 
 static inline struct layoutdriver_io_operations *
-PNFS_LD_IO_OPS(struct pnfs_layout_type *lo)
+PNFS_LD_IO_OPS(struct pnfs_layout_hdr *lo)
 {
 	return PNFS_LD(lo)->ld_io_ops;
 }
@@ -94,7 +94,7 @@ struct pnfs_layout_segment {
 	struct nfs4_pnfs_layout_segment range;
 	struct kref kref;
 	bool valid;
-	struct pnfs_layout_type *layout;
+	struct pnfs_layout_hdr *layout;
 	struct nfs4_deviceid *deviceid;
 	u8 ld_data[];			/* layout driver private data */
 };
@@ -135,8 +135,8 @@ struct layoutdriver_io_operations {
 	/* Layout information. For each inode, alloc_layout is executed once to retrieve an
 	 * inode specific layout structure.  Each subsequent layoutget operation results in
 	 * a set_layout call to set the opaque layout in the layout driver.*/
-	struct pnfs_layout_type * (*alloc_layout) (struct inode *inode);
-	void (*free_layout) (struct pnfs_layout_type *);
+	struct pnfs_layout_hdr * (*alloc_layout) (struct inode *inode);
+	void (*free_layout) (struct pnfs_layout_hdr *);
 	struct pnfs_layout_segment * (*alloc_lseg) (struct pnfs_layout_type *layoutid, struct nfs4_pnfs_layoutget_res *lgr);
 	void (*free_lseg) (struct pnfs_layout_segment *lseg);
 
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 6f67aec..420932a 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -104,7 +104,7 @@ struct nfs_delegation;
 
 struct posix_acl;
 
-struct pnfs_layout_type {
+struct pnfs_layout_hdr {
 	int refcount;
 	struct list_head lo_layouts;	/* other client layouts */
 	struct list_head segs;		/* layout segments list */
@@ -212,7 +212,7 @@ struct nfs_inode {
 	/* pNFS layout information */
 #if defined(CONFIG_NFS_V4_1)
 	wait_queue_head_t lo_waitq;
-	struct pnfs_layout_type *layout;
+	struct pnfs_layout_hdr *layout;
 	time_t pnfs_layout_suspend;
 #endif /* CONFIG_NFS_V4_1 */
 #endif /* CONFIG_NFS_V4*/
-- 
1.6.2.5

[PATCH 02/11] SQUASHME pnfs-submit rename pnfs_layout_type 2

[andros]

From: Andy Adamson <andros@netapp.com>

squash into pnfs_submit: filelayout alloc_layout and free_layout

Signed-off-by: Andy Adamson <andros@netapp.com>
---
 fs/nfs/nfs4filelayout.c |    6 +++---
 fs/nfs/nfs4filelayout.h |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index fea1772..fa08540 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -282,10 +282,10 @@ filelayout_write_pagelist(struct nfs_write_data *data, unsigned nr_pages, int sy
 
 /*
  * Create a filelayout layout structure and return it.  The pNFS client
- * will use the pnfs_layout_type type to refer to the layout for this
+ * will use the pnfs_layout_hdr type to refer to the layout for this
  * inode from now on.
  */
-static struct pnfs_layout_type *
+static struct pnfs_layout_hdr *
 filelayout_alloc_layout(struct inode *inode)
 {
 	struct nfs4_filelayout *flp;
@@ -297,7 +297,7 @@ filelayout_alloc_layout(struct inode *inode)
 
 /* Free a filelayout layout structure */
 static void
-filelayout_free_layout(struct pnfs_layout_type *lo)
+filelayout_free_layout(struct pnfs_layout_hdr *lo)
 {
 	dprintk("NFS_FILELAYOUT: freeing layout\n");
 	kfree(FILE_LO(lo));
diff --git a/fs/nfs/nfs4filelayout.h b/fs/nfs/nfs4filelayout.h
index f8f7c05..c851919 100644
--- a/fs/nfs/nfs4filelayout.h
+++ b/fs/nfs/nfs4filelayout.h
@@ -62,7 +62,7 @@ struct nfs4_filelayout_segment {
 };
 
 struct nfs4_filelayout {
-	struct pnfs_layout_type fl_layout;
+	struct pnfs_layout_hdr fl_layout;
 	u32 stripe_unit;
 };
 
@@ -70,7 +70,7 @@ extern struct nfs_fh *
 nfs4_fl_select_ds_fh(struct pnfs_layout_segment *lseg, loff_t offset);
 
 static inline struct nfs4_filelayout *
-FILE_LO(struct pnfs_layout_type *lo)
+FILE_LO(struct pnfs_layout_hdr *lo)
 {
 	return container_of(lo, struct nfs4_filelayout, fl_layout);
 }
-- 
1.6.2.5

[PATCH 03/11] SQUASHME pnfs-submit rename pnfs_layout_type 3

[andros]

From: Andy Adamson <andros@netapp.com>

squash into pnfs_submit: layout segment alloc, reference, destroy

Signed-off-by: Andy Adamson <andros@netapp.com>
---
 fs/nfs/pnfs.c             |    2 +-
 include/linux/nfs4_pnfs.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index bf86975..98f53c2 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -412,7 +412,7 @@ pnfs_destroy_all_layouts(struct nfs_client *clp)
 }
 
 static inline void
-init_lseg(struct pnfs_layout_type *lo, struct pnfs_layout_segment *lseg)
+init_lseg(struct pnfs_layout_hdr *lo, struct pnfs_layout_segment *lseg)
 {
 	INIT_LIST_HEAD(&lseg->fi_list);
 	kref_init(&lseg->kref);
diff --git a/include/linux/nfs4_pnfs.h b/include/linux/nfs4_pnfs.h
index 59a1a12..89d0e7e 100644
--- a/include/linux/nfs4_pnfs.h
+++ b/include/linux/nfs4_pnfs.h
@@ -137,7 +137,7 @@ struct layoutdriver_io_operations {
 	 * a set_layout call to set the opaque layout in the layout driver.*/
 	struct pnfs_layout_hdr * (*alloc_layout) (struct inode *inode);
 	void (*free_layout) (struct pnfs_layout_hdr *);
-	struct pnfs_layout_segment * (*alloc_lseg) (struct pnfs_layout_type *layoutid, struct nfs4_pnfs_layoutget_res *lgr);
+	struct pnfs_layout_segment * (*alloc_lseg) (struct pnfs_layout_hdr *layoutid, struct nfs4_pnfs_layoutget_res *lgr);
 	void (*free_lseg) (struct pnfs_layout_segment *lseg);
 
 	/* Registration information for a new mounted file system
-- 
1.6.2.5

[PATCH 04/11] SQUASHME pnfs-submit rename pnfs_layout_type 4

[andros]

From: Andy Adamson <andros@netapp.com>

squash into pnfs_submit: layoutget

Signed-off-by: Andy Adamson <andros@netapp.com>
---
 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

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

[andros]

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

[PATCH 06/11] SQUASHME pnfs-submit: rename pnfs_layout_type 6

[andros]

From: Andy Adamson <andros@netapp.com>

squash into pnfs_submit: filelayout layout segment alloc and free

Signed-off-by: Andy Adamson <andros@netapp.com>
---
 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

[PATCH 07/11] SQUASHME pnfs_submit: rename pnfs_layout_type 7

[andros]

From: Andy Adamson <andros@netapp.com>

squash into pnfs_submit: layoutreturn helper functions

Signed-off-by: Andy Adamson <andros@netapp.com>
---
 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

[PATCH 08/11] SQUASHME pnfs_submit rename pnfs_layout_type 8

[andros]

From: Andy Adamson <andros@netapp.com>

squash into pnfs_submit: layoutreturn

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

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 8879fab..10cf7e2 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5698,7 +5698,7 @@ static void nfs4_pnfs_layoutreturn_done(struct rpc_task *task, void *calldata)
 static void nfs4_pnfs_layoutreturn_release(void *calldata)
 {
 	struct nfs4_pnfs_layoutreturn *lrp = calldata;
-	struct pnfs_layout_type *lo = NFS_I(lrp->args.inode)->layout;
+	struct pnfs_layout_hdr *lo = NFS_I(lrp->args.inode)->layout;
 
 	dprintk("--> %s return_type %d lo %p\n", __func__,
 		lrp->args.return_type, lo);
-- 
1.6.2.5

[PATCH 09/11] SQUASHME pnfs_submit rename pnfs_layout_type 9

[andros]

From: Andy Adamson <andros@netapp.com>

squash into pnfs_submit-pageio-helpers

Signed-of-by: Andy Adamson <andros@netapp.com>
---
 fs/nfs/pnfs.c             |    6 +++---
 include/linux/nfs4_pnfs.h |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index b9bf9d6..52d1a79 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1163,14 +1163,14 @@ out:
 void
 pnfs_set_pg_test(struct inode *inode, struct nfs_pageio_descriptor *pgio)
 {
-	struct pnfs_layout_type *laytype;
+	struct pnfs_layout_hdr *lo;
 	struct pnfs_layoutdriver_type *ld;
 
 	pgio->pg_test = NULL;
 
-	laytype = NFS_I(inode)->layout;
+	lo = NFS_I(inode)->layout;
 	ld = NFS_SERVER(inode)->pnfs_curr_ld;
-	if (!pnfs_enabled_sb(NFS_SERVER(inode)) || !laytype)
+	if (!pnfs_enabled_sb(NFS_SERVER(inode)) || !lo)
 		return;
 
 	if (ld->ld_policy_ops)
diff --git a/include/linux/nfs4_pnfs.h b/include/linux/nfs4_pnfs.h
index 89d0e7e..cbb98f1 100644
--- a/include/linux/nfs4_pnfs.h
+++ b/include/linux/nfs4_pnfs.h
@@ -148,7 +148,7 @@ struct layoutdriver_io_operations {
 
 struct layoutdriver_policy_operations {
 	/* The stripe size of the file system */
-	ssize_t (*get_stripesize) (struct pnfs_layout_type *layoutid);
+	ssize_t (*get_stripesize) (struct pnfs_layout_hdr *layoutid);
 
 	/* test for nfs page cache coalescing */
 	int (*pg_test)(struct nfs_pageio_descriptor *, struct nfs_page *, struct nfs_page *);
-- 
1.6.2.5

[PATCH 10/11] SQUASHME pnfs_submit rename pnfs_layout_type 10

[andros]

From: Andy Adamson <andros@netapp.com>

squash into pnfs_submit: cb_layoutrecall

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

diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c
index e2ea2be..638f074 100644
--- a/fs/nfs/callback_proc.c
+++ b/fs/nfs/callback_proc.c
@@ -120,7 +120,7 @@ int nfs4_validate_delegation_stateid(struct nfs_delegation *delegation, const nf
 #if defined(CONFIG_NFS_V4_1)
 
 static bool
-pnfs_is_next_layout_stateid(const struct pnfs_layout_type *lo,
+pnfs_is_next_layout_stateid(const struct pnfs_layout_hdr *lo,
 			    const nfs4_stateid stateid)
 {
 	int seqlock;
@@ -161,7 +161,7 @@ nfs_layoutrecall_find_inode(struct nfs_client *clp,
 			    const struct cb_pnfs_layoutrecallargs *args)
 {
 	struct nfs_inode *nfsi;
-	struct pnfs_layout_type *layout;
+	struct pnfs_layout_hdr *lo;
 	struct nfs_server *server;
 	struct inode *ino = NULL;
 
@@ -169,8 +169,8 @@ nfs_layoutrecall_find_inode(struct nfs_client *clp,
 		__func__, args->cbl_recall_type, clp);
 
 	spin_lock(&clp->cl_lock);
-	list_for_each_entry(layout, &clp->cl_layouts, lo_layouts) {
-		nfsi = PNFS_NFS_INODE(layout);
+	list_for_each_entry(lo, &clp->cl_layouts, lo_layouts) {
+		nfsi = PNFS_NFS_INODE(lo);
 		if (!nfsi)
 			continue;
 
-- 
1.6.2.5

[PATCH 11/11] SQUASHME pnfs_submit rename pnfs_layout_type 11

[andros]

From: Andy Adamson <andros@netapp.com>

squash into pnfs_submit: filelayout policy operations

Signed-off-by: Andy Adamson <andros@netapp.com>
---
 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 87c8fe0..eb9c907 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -673,9 +673,9 @@ filelayout_commit(struct nfs_write_data *data, int sync)
 
 /* Return the stripesize for the specified file */
 ssize_t
-filelayout_get_stripesize(struct pnfs_layout_type *layoutid)
+filelayout_get_stripesize(struct pnfs_layout_hdr *lo)
 {
-	struct nfs4_filelayout *flo = FILE_LO(layoutid);
+	struct nfs4_filelayout *flo = FILE_LO(lo);
 
 	return flo->stripe_unit;
 }
-- 
1.6.2.5