---

yaml --- r: 12210 b: refs/heads/master c: 374e2ac h: refs/heads/master v: v3
git-mirror · Nov 2, 2005 · 5ba91e6 · 5ba91e6
1 parent 938d7d3
commit 5ba91e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4750ddb0ba781006f149fdd87bbe997cb8c07e2e
+refs/heads/master: 374e2ac33724d1dd432b6c75f9b1adf715c2add7
diff --git a/trunk/fs/xfs/xfs_vnodeops.c b/trunk/fs/xfs/xfs_vnodeops.c
@@ -626,8 +626,10 @@ xfs_setattr(
 	 */
 	if (mask & XFS_AT_SIZE) {
 		code = 0;
-		if (vap->va_size > ip->i_d.di_size)
+		if ((vap->va_size > ip->i_d.di_size) && 
+		    (flags & ATTR_NOSIZETOK) == 0) {
 			code = xfs_igrow_start(ip, vap->va_size, credp);
+		}
 		xfs_iunlock(ip, XFS_ILOCK_EXCL);
 		if (!code)
 			code = xfs_itruncate_data(ip, vap->va_size);