summaryrefslogtreecommitdiffstats
path: root/kernel/fs/reiserfs/xattr_acl.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/fs/reiserfs/xattr_acl.c')
-rw-r--r--kernel/fs/reiserfs/xattr_acl.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/fs/reiserfs/xattr_acl.c b/kernel/fs/reiserfs/xattr_acl.c
index 4b34b9dc0..9b1824f35 100644
--- a/kernel/fs/reiserfs/xattr_acl.c
+++ b/kernel/fs/reiserfs/xattr_acl.c
@@ -246,13 +246,9 @@ __reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode,
case ACL_TYPE_ACCESS:
name = POSIX_ACL_XATTR_ACCESS;
if (acl) {
- error = posix_acl_equiv_mode(acl, &inode->i_mode);
- if (error < 0)
+ error = posix_acl_update_mode(inode, &inode->i_mode, &acl);
+ if (error)
return error;
- else {
- if (error == 0)
- acl = NULL;
- }
}
break;
case ACL_TYPE_DEFAULT: