[PATCH 2/3] SQUASHME: pnfsd-lexp: fixup LAYOUT_NFSV4_1_FILES

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

 



Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx>
---
 fs/nfsd/pnfsd_lexp.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/nfsd/pnfsd_lexp.c b/fs/nfsd/pnfsd_lexp.c
index 2d95913..bf2f403 100644
--- a/fs/nfsd/pnfsd_lexp.c
+++ b/fs/nfsd/pnfsd_lexp.c
@@ -31,7 +31,7 @@ size_t pnfs_lexp_addr_len;
 static int
 pnfsd_lexp_layout_type(struct super_block *sb)
 {
-	int ret = LAYOUT_NFSV4_FILES;
+	int ret = LAYOUT_NFSV4_1_FILES;
 	dprintk("<-- %s: return %d\n", __func__, ret);
 	return ret;
 }
@@ -43,7 +43,7 @@ pnfsd_lexp_get_device_iter(struct super_block *sb,
 {
 	dprintk("--> %s: sb=%p\n", __func__, sb);
 
-	BUG_ON(layout_type != LAYOUT_NFSV4_FILES);
+	BUG_ON(layout_type != LAYOUT_NFSV4_1_FILES);
 
 	res->gd_eof = 1;
 	if (res->gd_cookie)
@@ -72,7 +72,7 @@ pnfsd_lexp_get_device_info(struct super_block *sb,
 
 	dprintk("--> %s: sb=%p\n", __func__, sb);
 
-	BUG_ON(layout_type != LAYOUT_NFSV4_FILES);
+	BUG_ON(layout_type != LAYOUT_NFSV4_1_FILES);
 
 	memset(&fdev, '\0', sizeof(fdev));
 
@@ -138,7 +138,7 @@ pnfsd_lexp_layout_get(struct inode *inode,
 
 	dprintk("--> %s: inode=%p\n", __func__, inode);
 
-	res->lg_seg.layout_type = LAYOUT_NFSV4_FILES;
+	res->lg_seg.layout_type = LAYOUT_NFSV4_1_FILES;
 	res->lg_seg.offset = 0;
 	res->lg_seg.length = NFS4_MAX_UINT64;
 
@@ -149,7 +149,7 @@ pnfsd_lexp_layout_get(struct inode *inode,
 	}
 
 	/* Set file layout response args */
-	layout->lg_layout_type = LAYOUT_NFSV4_FILES;
+	layout->lg_layout_type = LAYOUT_NFSV4_1_FILES;
 	layout->lg_stripe_type = STRIPE_SPARSE;
 	layout->lg_commit_through_mds = true;
 	layout->lg_stripe_unit = get_stripe_unit(inode->i_sb->s_blocksize);
-- 
1.6.6.1

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