diff options
Diffstat (limited to 'fs/reiserfs/xattr_acl.c')
-rw-r--r-- | fs/reiserfs/xattr_acl.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c index 4b34b9dc03dd..9b1824f35501 100644 --- a/fs/reiserfs/xattr_acl.c +++ b/fs/reiserfs/xattr_acl.c | |||
@@ -246,13 +246,9 @@ __reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode, | |||
246 | case ACL_TYPE_ACCESS: | 246 | case ACL_TYPE_ACCESS: |
247 | name = POSIX_ACL_XATTR_ACCESS; | 247 | name = POSIX_ACL_XATTR_ACCESS; |
248 | if (acl) { | 248 | if (acl) { |
249 | error = posix_acl_equiv_mode(acl, &inode->i_mode); | 249 | error = posix_acl_update_mode(inode, &inode->i_mode, &acl); |
250 | if (error < 0) | 250 | if (error) |
251 | return error; | 251 | return error; |
252 | else { | ||
253 | if (error == 0) | ||
254 | acl = NULL; | ||
255 | } | ||
256 | } | 252 | } |
257 | break; | 253 | break; |
258 | case ACL_TYPE_DEFAULT: | 254 | case ACL_TYPE_DEFAULT: |