summary refs log tree commit diff
path: root/fs/jfs/acl.c
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2014-03-05 17:22:57 +0000
committerMatt Fleming <matt.fleming@intel.com>2014-03-05 17:31:41 +0000
commit4fd69331ad227a4d8de26592d017b73e00caca9f (patch)
treebfd95ed518ff0cb44318715432d321a92a7b9a0c /fs/jfs/acl.c
parent69e608411473ac56358ef35277563982d0565381 (diff)
parent0ac09f9f8cd1fb028a48330edba6023d347d3cea (diff)
downloadlinux-4fd69331ad227a4d8de26592d017b73e00caca9f.tar.gz
Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo
Conflicts:
	arch/x86/include/asm/efi.h
Diffstat (limited to 'fs/jfs/acl.c')
-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;