[pnfs] [PATCH 08/37] pnfs: rename virtual_update_layout to pnfs_update_layout

[Benny Halevy]

Signed-off-by: Benny Halevy <bhalevy at panasas.com>
---
 fs/nfs/pnfs.c |   34 +++++++++++++++++-----------------
 fs/nfs/pnfs.h |    2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 72c740f..592cf13 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -449,11 +449,11 @@ pnfs_inject_layout(struct nfs_inode *nfsi,
  * upon the returned data ranges from get_layout.
  */
 int
-virtual_update_layout(struct inode *ino,
-		      struct nfs_open_context *ctx,
-		      size_t count,
-		      loff_t pos,
-		      enum pnfs_iomode iomode)
+pnfs_update_layout(struct inode *ino,
+		   struct nfs_open_context *ctx,
+		   size_t count,
+		   loff_t pos,
+		   enum pnfs_iomode iomode)
 {
 	struct nfs4_pnfs_layoutget_res res;
 	struct nfs4_pnfs_layoutget_arg arg;
@@ -696,7 +696,7 @@ pnfs_set_ds_rsize(struct inode *inode,
 	dprintk("%s count %ld\n", __func__,(long int)count);
 
 
-	status = virtual_update_layout(inode, ctx, count,
+	status = pnfs_update_layout(inode, ctx, count,
 						offset, IOMODE_READ);
 	dprintk("%s *rsize %Zd virt update returned %d\n",
 					__func__, *rsize, status);
@@ -881,11 +881,11 @@ pnfs_writepages(struct nfs_write_data *wdata, int how)
 		args->offset);
 
 	/* Retrieve and set layout if not allready cached */
-	status = virtual_update_layout(inode,
-				       args->context,
-				       args->count,
-				       args->offset,
-				       IOMODE_RW);
+	status = pnfs_update_layout(inode,
+				    args->context,
+				    args->count,
+				    args->offset,
+				    IOMODE_RW);
 	if (status) {
 		status = 1;	/* retry with nfs I/O */
 		goto out;
@@ -985,14 +985,14 @@ pnfs_readpages(struct nfs_read_data *rdata)
 		args->offset);
 
 	/* Retrieve and set layout if not allready cached */
-	status = virtual_update_layout(inode,
-				       args->context,
-				       args->count,
-				       args->offset,
-				       IOMODE_READ);
+	status = pnfs_update_layout(inode,
+				    args->context,
+				    args->count,
+				    args->offset,
+				    IOMODE_READ);
 	if (status) {
 		printk(KERN_WARNING
-		       "%s: ERROR %d from virtual_update_layout\n",
+		       "%s: ERROR %d from pnfs_update_layout\n",
 			__FUNCTION__, status);
 		status = 1;
 		goto out;
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 6a5931f..05a97d6 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -15,7 +15,7 @@
 #ifdef CONFIG_PNFS
 #include <linux/nfs_page.h>
 
-int virtual_update_layout(struct inode *ino, struct nfs_open_context *ctx,
+int pnfs_update_layout(struct inode *ino, struct nfs_open_context *ctx,
 	size_t count, loff_t pos, enum pnfs_iomode access_type);
 
 int pnfs_return_layout(struct inode *ino, struct nfs4_pnfs_layout_segment *range);
-- 
1.5.3.3