summaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2006-04-11 07:12:45 +0200
committerNathan Scott <nathans@sgi.com>2006-04-11 07:12:45 +0200
commit8c0b5113a55c698f3190ec85925815640f1c2049 (patch)
tree99f0d35a0a69a1b7fa870fed3f0c2fc22c995489 /fs/xfs
parent[XFS] Fix an inode use-after-free durin an unpin. When reclaiming inodes (diff)
downloadlinux-8c0b5113a55c698f3190ec85925815640f1c2049.tar.xz
linux-8c0b5113a55c698f3190ec85925815640f1c2049.zip
[XFS] 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/xfs')
-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 149237304fb6..2e2e275c786f 100644
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -673,8 +673,7 @@ xfs_vn_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;