Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d94ea51 authored by Joseph Qi's avatar Joseph Qi Committed by Linus Torvalds
Browse files

ocfs2: clean up dead code in ocfs2_acl_from_xattr() 



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: default avatarJoseph Qi <joseph.qi@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Acked-by: default avatarJoel Becker <jlbec@evilplan.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent df53cd3b

fs/ocfs2/acl.c

+0 −4
Original line number Diff line number Diff line
@@ -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)