Commit 681b1200 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAlex Elder <aelder@sgi.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent c4ed4243
...@@ -773,14 +773,15 @@ xfs_setattr_size( ...@@ -773,14 +773,15 @@ xfs_setattr_size(
*/ */
if (iattr->ia_size == 0 && if (iattr->ia_size == 0 &&
ip->i_size == 0 && ip->i_d.di_nextents == 0) { ip->i_size == 0 && ip->i_d.di_nextents == 0) {
xfs_iunlock(ip, XFS_ILOCK_EXCL); if (!(mask & (ATTR_CTIME|ATTR_MTIME)))
lock_flags &= ~XFS_ILOCK_EXCL; goto out_unlock;
if (mask & ATTR_CTIME) {
inode->i_mtime = inode->i_ctime = /*
current_fs_time(inode->i_sb); * Use the regular setattr path to update the timestamps.
xfs_mark_inode_dirty_sync(ip); */
} xfs_iunlock(ip, lock_flags);
goto out_unlock; iattr->ia_valid &= ~ATTR_SIZE;
return xfs_setattr_nonsize(ip, iattr, 0);
} }
/* /*
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment