Commit 11850392 authored Nov 29, 2013 by Michal Nazarewicz Committed by Chris Mason Jan 28, 2014

btrfs: remove dead code



[commit 8185554d: fix incorrect inode acl reset] introduced a dead
code by adding a condition which can never be true to an else
branch.  The condition can never be true because it is already
checked by a previous if statement which causes function to return.

Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Reviewed-By: Filipe David Borba Manana <fdmanana@gmail.com>
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Chris Mason <clm@fb.com>

parent 878f2d2c

fs/btrfs/acl.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -225,13 +225,8 @@ int btrfs_init_acl(struct btrfs_trans_handle *trans,
		ret = posix_acl_create(&acl, GFP_NOFS, &inode->i_mode);
		if (ret < 0)
		return ret;

		if (ret > 0) {
		/* we need an acl */
		if (ret > 0) /* we need an acl */
		ret = btrfs_set_acl(trans, inode, acl, ACL_TYPE_ACCESS);
		} else if (ret < 0) {
		cache_no_acl(inode);
		}
		} else {
		cache_no_acl(inode);
		}

Admin message