From f68f77850011af0a747cabbc304795c193be93d6 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Fri, 26 Oct 2007 13:31:47 -0400
Subject: [PATCH] --- yaml --- r: 79604 b: refs/heads/master c:
 8a8c74bf94fcdec058062d331b3d9777910778ab h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/inode.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2d02c08d2ee4..c27083c0ec2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b45b74ce2234ca15131ec0725010c1da818df05
+refs/heads/master: 8a8c74bf94fcdec058062d331b3d9777910778ab
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
index db5d96dc6107..cd0e57f3a00f 100644
--- a/trunk/fs/nfs/inode.c
+++ b/trunk/fs/nfs/inode.c
@@ -814,8 +814,9 @@ static void nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr *fattr)
 			if (S_ISDIR(inode->i_mode))
 				nfsi->cache_validity |= NFS_INO_INVALID_DATA;
 		}
-		if (inode->i_size == fattr->pre_size && nfsi->npages == 0)
-			inode->i_size = fattr->size;
+		if (inode->i_size == nfs_size_to_loff_t(fattr->pre_size) &&
+		    nfsi->npages == 0)
+			inode->i_size = nfs_size_to_loff_t(fattr->size);
 	}
 }