From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-we0-f182.google.com ([74.125.82.182]:52326 "EHLO mail-we0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756750Ab3K2RBX (ORCPT ); Fri, 29 Nov 2013 12:01:23 -0500 Received: by mail-we0-f182.google.com with SMTP id q59so9754903wes.27 for ; Fri, 29 Nov 2013 09:01:22 -0800 (PST) From: Michal Nazarewicz To: Chris Mason , Filipe David Borba Manana Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] btrfs: remove dead code Date: Fri, 29 Nov 2013 18:01:15 +0100 Message-Id: <1385744475-9614-1-git-send-email-mpn@google.com> Sender: linux-btrfs-owner@vger.kernel.org List-ID: From: Michal Nazarewicz [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 --- 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