summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-18 15:49:40 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-18 15:49:40 -0800
commit341bbdc512633592198e6b434ca99a29bab7e02a (patch)
tree0530cd642156b9da3f768fb663f1e90a73134924 /fs
parent805937cf45f9a9933e6b8e5c6660406e977a9a23 (diff)
parent844fa1b5f8493cff4b976fa7a5b9ebeeafdd75cc (diff)
Merge tag 'jfs-3.14-rc4' of git://github.com/kleikamp/linux-shaggy
Pull jfs fix from David Kleikamp: "Another ACL regression. This one more subtle" * tag 'jfs-3.14-rc4' of git://github.com/kleikamp/linux-shaggy: jfs: set i_ctime when setting ACL
Diffstat (limited to 'fs')
-rw-r--r--fs/jfs/acl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c
index e973b85d6afd..5a8ea16eedbc 100644
--- a/fs/jfs/acl.c
+++ b/fs/jfs/acl.c
@@ -86,6 +86,8 @@ static int __jfs_set_acl(tid_t tid, struct inode *inode, int type,
rc = posix_acl_equiv_mode(acl, &inode->i_mode);
if (rc < 0)
return rc;
+ inode->i_ctime = CURRENT_TIME;
+ mark_inode_dirty(inode);
if (rc == 0)
acl = NULL;
break;