[PATCH 2/2] xfs: always log timestamp updates in xfs_setattr_size

[Dave Chinner]

On Fri, Jun 17, 2011 at 09:15:56AM -0400, Christoph Hellwig wrote:
> 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_simple
> for it to treat it like a utimes calls.
> 
> Signed-off-by: Christoph Hellwig <hch at lst.de>
> 
> Index: xfs/fs/xfs/linux-2.6/xfs_iops.c
> ===================================================================
> --- xfs.orig/fs/xfs/linux-2.6/xfs_iops.c	2011-05-23 14:29:07.815944904 +0200
> +++ xfs/fs/xfs/linux-2.6/xfs_iops.c	2011-05-23 14:29:26.067946531 +0200
> @@ -776,14 +776,16 @@ 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))
> +			goto out_unlock;
> +
> +		/*
> +		 * Use the regular setattr path to update the timestamps.
> +		 */
> +		xfs_iunlock(ip, lock_flags);
> +		iattr->ia_valid &= ~ATTR_SIZE;
> +		iattr->ia_valid |= ATTR_MTIME;
> +		return xfs_setattr_simple(ip, iattr, 0);
>  	}

Seems like a sane thing to do to me ;)

Reviewed-by: Dave Chinner <dchinner at redhat.com>

-- 
Dave Chinner
david at fromorbit.com