diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
| commit | 7fb3a069bc5d3577409c2ae89f89cd264ff85816 (patch) | |
| tree | 7fe3ba3b95faeecb01e4feafb9288ef4b523c6b3 /fs/xfs/linux-2.6/xfs_acl.c | |
| parent | 291186e049d7f8178ad31d43c38a53889f25d79e (diff) | |
| parent | 9d3415a8cc76ff65c6602a121ac318432c5cd7ba (diff) | |
Merge branch 'fix/misc' into topic/misc
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_acl.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_acl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_acl.c b/fs/xfs/linux-2.6/xfs_acl.c index 2512125dfa7..883ca5ab8af 100644 --- a/fs/xfs/linux-2.6/xfs_acl.c +++ b/fs/xfs/linux-2.6/xfs_acl.c | |||
| @@ -251,8 +251,9 @@ xfs_set_mode(struct inode *inode, mode_t mode) | |||
| 251 | if (mode != inode->i_mode) { | 251 | if (mode != inode->i_mode) { |
| 252 | struct iattr iattr; | 252 | struct iattr iattr; |
| 253 | 253 | ||
| 254 | iattr.ia_valid = ATTR_MODE; | 254 | iattr.ia_valid = ATTR_MODE | ATTR_CTIME; |
| 255 | iattr.ia_mode = mode; | 255 | iattr.ia_mode = mode; |
| 256 | iattr.ia_ctime = current_fs_time(inode->i_sb); | ||
| 256 | 257 | ||
| 257 | error = -xfs_setattr(XFS_I(inode), &iattr, XFS_ATTR_NOACL); | 258 | error = -xfs_setattr(XFS_I(inode), &iattr, XFS_ATTR_NOACL); |
| 258 | } | 259 | } |