summaryrefslogtreecommitdiffstats
path: root/kernel/fs/gfs2
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/fs/gfs2')
-rw-r--r--kernel/fs/gfs2/acl.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/kernel/fs/gfs2/acl.c b/kernel/fs/gfs2/acl.c
index 1be3b061c..ff0ac96a8 100644
--- a/kernel/fs/gfs2/acl.c
+++ b/kernel/fs/gfs2/acl.c
@@ -79,17 +79,11 @@ int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
if (type == ACL_TYPE_ACCESS) {
umode_t mode = inode->i_mode;
- error = posix_acl_equiv_mode(acl, &mode);
- if (error < 0)
+ error = posix_acl_update_mode(inode, &inode->i_mode, &acl);
+ if (error)
return error;
-
- if (error == 0)
- acl = NULL;
-
- if (mode != inode->i_mode) {
- inode->i_mode = mode;
+ if (mode != inode->i_mode)
mark_inode_dirty(inode);
- }
}
if (acl) {