diff --git a/[refs] b/[refs]
index cb0a2ce17fef..e7f2d015d77e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf1e99a4e0daa4a5623cd71108509823b9ff2d30
+refs/heads/master: 2f26afba46f0ebf155cf9be746496a0304a5b7cf
diff --git a/trunk/fs/btrfs/acl.c b/trunk/fs/btrfs/acl.c
index 6ef7b26724ec..6b4d0cca5c7f 100644
--- a/trunk/fs/btrfs/acl.c
+++ b/trunk/fs/btrfs/acl.c
@@ -160,6 +160,9 @@ static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name,
 	int ret;
 	struct posix_acl *acl = NULL;
 
+	if (!is_owner_or_cap(dentry->d_inode))
+		return -EPERM;
+
 	if (value) {
 		acl = posix_acl_from_xattr(value, size);
 		if (acl == NULL) {