ocfs2: clean up dead code in ocfs2_acl_from_xattr()
authorJoseph Qi <joseph.qi@huawei.com>
Wed, 11 Sep 2013 21:19:51 +0000 (14:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Sep 2013 22:56:39 +0000 (15:56 -0700)
In ocfs2_acl_from_xattr(), if size is less than sizeof(struct
posix_acl_entry), it returns ERR_PTR(-EINVAL) directly.  Then assign (size
/ sizeof(struct posix_acl_entry)) to count which will be at least 1, that
means the following branch (count < 0) and (count == 0) will never be
true.

Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Acked-by: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/ocfs2/acl.c

index 8a404576fb26557eb8578e21f66d0277a94a9e76..b4f788e0ca318955ab797f2350f8dffa320a53cb 100644 (file)
@@ -51,10 +51,6 @@ static struct posix_acl *ocfs2_acl_from_xattr(const void *value, size_t size)
                return ERR_PTR(-EINVAL);
 
        count = size / sizeof(struct posix_acl_entry);
-       if (count < 0)
-               return ERR_PTR(-EINVAL);
-       if (count == 0)
-               return NULL;
 
        acl = posix_acl_alloc(count, GFP_NOFS);
        if (!acl)