diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 14:50:47 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 14:50:47 (GMT) |
commit | 55982d94009c8fb1ea79855dba0c079c36224c38 (patch) | |
tree | 7390e8dd259c93d20896410930539b84ac4a3db8 /fs | |
parent | a7b917256d8afacadc614414c4b0d411f76f3747 (diff) | |
parent | 30e2bab2d6e22188c6d36a09cdcffb4748d2dbe5 (diff) | |
download | linux-fsl-qoriq-55982d94009c8fb1ea79855dba0c079c36224c38.tar.xz |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
ext3: update ctime when changing the file's permission by setfacl
ext2: update ctime when changing the file's permission by setfacl
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext2/acl.c | 1 | ||||
-rw-r--r-- | fs/ext3/acl.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c index ca7e2a0..2bcc043 100644 --- a/fs/ext2/acl.c +++ b/fs/ext2/acl.c @@ -200,6 +200,7 @@ ext2_set_acl(struct inode *inode, int type, struct posix_acl *acl) return error; else { inode->i_mode = mode; + inode->i_ctime = CURRENT_TIME_SEC; mark_inode_dirty(inode); if (error == 0) acl = NULL; diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c index 01552ab..8a11fe2 100644 --- a/fs/ext3/acl.c +++ b/fs/ext3/acl.c @@ -205,6 +205,7 @@ ext3_set_acl(handle_t *handle, struct inode *inode, int type, return error; else { inode->i_mode = mode; + inode->i_ctime = CURRENT_TIME_SEC; ext3_mark_inode_dirty(handle, inode); if (error == 0) acl = NULL; |