summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2006-04-11 15:12:45 +1000
committerGreg Kroah-Hartman <gregkh@suse.de>2006-04-17 13:16:06 -0700
commitbc5bd8ac3c6956c7ce2c838e8e2f01435b8e4e0b (patch)
treebf2fb29c258d3cc3300103fa18e36db3af2b8014 /fs
parent3e1792fa40be9dd0f530e2b32f439bb97c40bcee (diff)
downloadlwn-bc5bd8ac3c6956c7ce2c838e8e2f01435b8e4e0b.tar.gz
lwn-bc5bd8ac3c6956c7ce2c838e8e2f01435b8e4e0b.zip
[PATCH] Fix utime(2) in the case that no times parameter was passed in.
SGI-PV: 949858 SGI-Modid: xfs-linux-melb:xfs-kern:25717a Signed-off-by: Jes Sorensen <jes@sgi.com> Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/linux-2.6/xfs_iops.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index d7f6f2d8ac8e..43808e22cc64 100644
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -673,8 +673,7 @@ linvfs_setattr(
if (ia_valid & ATTR_ATIME) {
vattr.va_mask |= XFS_AT_ATIME;
vattr.va_atime = attr->ia_atime;
- if (ia_valid & ATTR_ATIME_SET)
- inode->i_atime = attr->ia_atime;
+ inode->i_atime = attr->ia_atime;
}
if (ia_valid & ATTR_MTIME) {
vattr.va_mask |= XFS_AT_MTIME;