[PATCH 09/13] SQUASHME pnfs_submit: change nfs_fsino layoutclass name

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Andy Adamson <andros@xxxxxxxxxx>

Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
---
 fs/nfs/client.c         |    2 +-
 fs/nfs/nfs4xdr.c        |    2 +-
 include/linux/nfs_xdr.h |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 887d71e..004c5d3 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -903,7 +903,7 @@ static void nfs_server_set_fsinfo(struct nfs_server *server, struct nfs_fsinfo *
 	server->wpages = (server->wsize + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
 #ifdef CONFIG_NFS_V4_1
 	/* Save the layout type for use during init of layout driver */
-	server->pnfs_fs_ltype = fsinfo->layoutclass;
+	server->pnfs_fs_ltype = fsinfo->layouttype;
 #endif /* CONFIG_NFS_V4_1 */
 
 	server->wtmult = nfs_block_bits(fsinfo->wtmult, NULL);
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 7089284..e191488 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -4277,7 +4277,7 @@ static int decode_fsinfo(struct xdr_stream *xdr, struct nfs_fsinfo *fsinfo)
 		goto xdr_error;
 	fsinfo->wtpref = fsinfo->wtmax;
 #if defined(CONFIG_NFS_V4_1)
-	status = decode_attr_pnfstype(xdr, bitmap, &fsinfo->layoutclass);
+	status = decode_attr_pnfstype(xdr, bitmap, &fsinfo->layouttype);
 	if (status)
 		goto xdr_error;
 #endif /* CONFIG_NFS_V4_1 */
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index ea1b2f0..dee1c8c 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -114,7 +114,7 @@ struct nfs_fsinfo {
 	__u64			maxfilesize;
 	__u32			lease_time; /* in seconds */
 #if defined(CONFIG_NFS_V4_1)
-	__u32			layoutclass; /* supported pnfs layout driver */
+	__u32			layouttype; /* supported pnfs layout driver */
 #endif
 };
 
-- 
1.6.6

--
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

[Index of Archives]     [Linux Filesystem Development]     [Linux USB Development]     [Linux Media Development]     [Video for Linux]     [Linux NILFS]     [Linux Audio Users]     [Yosemite Info]     [Linux SCSI]

  Powered by Linux