X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Ffs%2Fbtrfs%2Facl.c;fp=kernel%2Ffs%2Fbtrfs%2Facl.c;h=fb3e64d37cb4ca6d2faf4fadefd85b1477a95f2e;hb=52f993b8e89487ec9ee15a7fb4979e0f09a45b27;hp=9a0124a95851014c9000ed7822dc5fad0a2f6995;hpb=c189ccac5702322ed843fe17057035b7222a59b6;p=kvmfornfv.git

diff --git a/kernel/fs/btrfs/acl.c b/kernel/fs/btrfs/acl.c
index 9a0124a95..fb3e64d37 100644
--- a/kernel/fs/btrfs/acl.c
+++ b/kernel/fs/btrfs/acl.c
@@ -83,11 +83,9 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans,
 	case ACL_TYPE_ACCESS:
 		name = POSIX_ACL_XATTR_ACCESS;
 		if (acl) {
-			ret = posix_acl_equiv_mode(acl, &inode->i_mode);
-			if (ret < 0)
+			ret = posix_acl_update_mode(inode, &inode->i_mode, &acl);
+			if (ret)
 				return ret;
-			if (ret == 0)
-				acl = NULL;
 		}
 		ret = 0;
 		break;