aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'fs/jfs/acl.c')
-rw-r--r--fs/jfs/acl.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c
index 0c8ca830b113..9fad9f4fe883 100644
--- a/fs/jfs/acl.c
+++ b/fs/jfs/acl.c
@@ -84,13 +84,11 @@ static int __jfs_set_acl(tid_t tid, struct inode *inode, int type,
84 case ACL_TYPE_ACCESS: 84 case ACL_TYPE_ACCESS:
85 ea_name = POSIX_ACL_XATTR_ACCESS; 85 ea_name = POSIX_ACL_XATTR_ACCESS;
86 if (acl) { 86 if (acl) {
87 rc = posix_acl_equiv_mode(acl, &inode->i_mode); 87 rc = posix_acl_update_mode(inode, &inode->i_mode, &acl);
88 if (rc < 0) 88 if (rc)
89 return rc; 89 return rc;
90 inode->i_ctime = CURRENT_TIME; 90 inode->i_ctime = CURRENT_TIME;
91 mark_inode_dirty(inode); 91 mark_inode_dirty(inode);
92 if (rc == 0)
93 acl = NULL;
94 } 92 }
95 break; 93 break;
96 case ACL_TYPE_DEFAULT: 94 case ACL_TYPE_DEFAULT: