Merge commit '33b458d276bb' into kvm-master

[karo-tx-linux.git] / fs / btrfs / acl.c

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index ff9b3995d45394a607a7973458de3383ccd920ff..9a0124a95851014c9000ed7822dc5fad0a2f6995 100644 (file)
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -79,13 +79,6 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans,
        const char *name;
        char *value = NULL;
 
-       if (acl) {
-               ret = posix_acl_valid(acl);
-               if (ret < 0)
-                       return ret;
-               ret = 0;
-       }
-
        switch (type) {
        case ACL_TYPE_ACCESS:
                name = POSIX_ACL_XATTR_ACCESS;