---

yaml --- r: 255123 b: refs/heads/master c: 681b120 h: refs/heads/master i: 255121: 0b6f04e 255119: b710200 v: v3
git-mirror · Jul 8, 2011 · da99978 · da99978
1 parent 7b7a631
commit da99978
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4ed4243c40f97ed5b7b121777bbbc6aeaa722f0
+refs/heads/master: 681b120018e3c7e2680c93e8188c5ee34215df2f
diff --git a/trunk/fs/xfs/linux-2.6/xfs_iops.c b/trunk/fs/xfs/linux-2.6/xfs_iops.c
@@ -773,14 +773,15 @@ xfs_setattr_size(
 	 */
 	if (iattr->ia_size == 0 &&
 	    ip->i_size == 0 && ip->i_d.di_nextents == 0) {
-		xfs_iunlock(ip, XFS_ILOCK_EXCL);
-		lock_flags &= ~XFS_ILOCK_EXCL;
-		if (mask & ATTR_CTIME) {
-			inode->i_mtime = inode->i_ctime =
-					current_fs_time(inode->i_sb);
-			xfs_mark_inode_dirty_sync(ip);
-		}
-		goto out_unlock;
+		if (!(mask & (ATTR_CTIME|ATTR_MTIME)))
+			goto out_unlock;
+
+		/*
+		 * Use the regular setattr path to update the timestamps.
+		 */
+		xfs_iunlock(ip, lock_flags);
+		iattr->ia_valid &= ~ATTR_SIZE;
+		return xfs_setattr_nonsize(ip, iattr, 0);
 	}
 
 	/*