aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruenba@redhat.com>2017-09-25 09:37:15 -0400
committerBob Peterson <rpeterso@redhat.com>2017-09-25 13:33:19 -0400
commitc2c4be28c248232d5bdfa5911f3b721db771f4f0 (patch)
treee3bae0ed433bafa7ffa98aa918943e38ca56fe5a
parent38eedf2841b03b779710e8ad0442810a4747a348 (diff)
gfs2: Always update inode ctime in set_acl
Three-entry POSIX ACLs can be stored in the file mode permission bits, with no need to store them in extended attributes. When a process sets such a minimal ACL, the kernel updates the file mode like chmod does, and removes any existing extended attributes for that ACL. Make sure the ctime is always updated in that case. Fixes xfstest generic/307. Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> Signed-off-by: Bob Peterson <rpeterso@redhat.com>
-rw-r--r--fs/gfs2/acl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index 9d5eecb123de..776717f1eeea 100644
--- a/fs/gfs2/acl.c
+++ b/fs/gfs2/acl.c
@@ -141,6 +141,7 @@ int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
141 141
142 ret = __gfs2_set_acl(inode, acl, type); 142 ret = __gfs2_set_acl(inode, acl, type);
143 if (!ret && mode != inode->i_mode) { 143 if (!ret && mode != inode->i_mode) {
144 inode->i_ctime = current_time(inode);
144 inode->i_mode = mode; 145 inode->i_mode = mode;
145 mark_inode_dirty(inode); 146 mark_inode_dirty(inode);
146 } 147 }