xfs: always log timestamp updates in xfs_setattr_size

Get rid of the special case where we use unlogged timestamp updates for
a truncate to the current inode size, and just call xfs_setattr_nonsize
for it to treat it like a utimes calls.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index 65d3bf8..5a0fcb0 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/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);
        }
 
        /*