Re: [PATCH] btrfs: remove dead code

Filipe David Manana
2013-11-29T20:00:43Z

On Fri, Nov 29, 2013 at 5:01 PM, Michal Nazarewicz <mpn@google.com> wrote:
> From: Michal Nazarewicz <mina86@mina86.com>
>
> [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>

> ---
> fs/btrfs/acl.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
> index 0890c83..460f36b 100644
> --- a/fs/btrfs/acl.c
> +++ b/fs/btrfs/acl.c
> @@ -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);
> }
> --
> 1.8.4.1
>

--
Filipe David Manana,

"Reasonable men adapt themselves to the world.
Unreasonable men adapt the world to themselves.
That's why all progress depends on unreasonable men."