diff options
Diffstat (limited to 'fs/btrfs/acl.c')
-rw-r--r-- | fs/btrfs/acl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index 9a0124a95851..fb3e64d37cb4 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c | |||
@@ -83,11 +83,9 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans, | |||
83 | case ACL_TYPE_ACCESS: | 83 | case ACL_TYPE_ACCESS: |
84 | name = POSIX_ACL_XATTR_ACCESS; | 84 | name = POSIX_ACL_XATTR_ACCESS; |
85 | if (acl) { | 85 | if (acl) { |
86 | ret = posix_acl_equiv_mode(acl, &inode->i_mode); | 86 | ret = posix_acl_update_mode(inode, &inode->i_mode, &acl); |
87 | if (ret < 0) | 87 | if (ret) |
88 | return ret; | 88 | return ret; |
89 | if (ret == 0) | ||
90 | acl = NULL; | ||
91 | } | 89 | } |
92 | ret = 0; | 90 | ret = 0; |
93 | break; | 91 | break; |