From patchwork Fri Dec 25 12:45:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1420619 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=MFw3KyPR; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D2RWb4wK0z9sWF for ; Fri, 25 Dec 2020 23:45:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4D3C88269B; Fri, 25 Dec 2020 13:45:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="MFw3KyPR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 73B8A8269E; Fri, 25 Dec 2020 13:45:42 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B098182688 for ; Fri, 25 Dec 2020 13:45:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1608900335; bh=bPllcj1R4jv942m5L9abT8t/bEwX5ne5qlWM0csAsJk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=MFw3KyPRCSEMOyfW7kRK63maDAxvMvEkrDOBxYoj5QZNaS/AKk96BvIloKUQFRneM 0eGcfQPzw1c/ObOpkgwCFvl2xQVxYCd1qPi/wJ3TUKOfam0pZNBNzIN5+Ap9W36DWH Kc3x8Cu+wcyTegbdISwlc3Kmbb/23YnnWEc8ZY44= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([62.143.246.89]) by mail.gmx.com (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MbAh0-1kLdVm3gWu-00bauB; Fri, 25 Dec 2020 13:45:34 +0100 From: Heinrich Schuchardt To: Marek Behun Cc: Qu Wenruo , linux-btrfs@vger.kernel.org, u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] fs: btrfs: simplify close_ctree_fs_info() Date: Fri, 25 Dec 2020 13:45:25 +0100 Message-Id: <20201225124525.17707-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:WLMRotUOn7TU+JmXJq5tDyMr8HDAangBvC9wKY4onD3P99WjALO qIf28KKVoSpydiqJQEBgI/fNVHrqJV0Uaj8oGFe0Q3oe2n1tqxkncLvdo1KlxpfPknbFY/a MqxdMiNc3qWFe/h1c1MaUjAmE5tnd8sI2cvxGULnntcYZlAoQzaPArN6wYpCabotKuFWqzk wS+tSZe0urmAa39I/E6aQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:7hU3RZRbOcU=:PxemAzJmQaEvGhguQStXHk IpntOuzc3a/N+Yb9f3roT5HhE8AjzC07r9VpJ9tOkvfX52CcDAaVrvCQuqiB43vg8gs8DQgqw ctJjOvwS3NnDTZfglggVbunKc2mneqXXv+GI0q7u4eu7RAk3VelkiP9pBJ92NbqFuWhm7SKqh zvZsDTyGhwgw2AdS+flAEEc59SNvBKnmchcnTRD2PHN50eVjXfZla7qvHSx5+wjs0D18smGSf Tz32pKdzUkgw3nJS/JbCvzPywGm+FWLnTb7jusGVDZvswd0Qqe4Xgmv5SrTOZZmLYEKjxnk4Q r+7H2IfRbffE5HjFp71/kPnyMFAQYWIj7qdkAEshbhBWft6Nn+wO8oKPFwYU5D4ENdkONWJST rK7E3UTS5QMIlzYOJkWkYchU3LXUlyPb79VypiAwlchkyA7gyhvIU8x6g3yH/jfc6/uPwbYJN tc+kjxkddK696mhs6IFtzbKZLWb9ZrENl/Iazz7pn6f4Aq9F09DB36sGKFosgqXSjYBc3kwbN 219lTPXzr2xR2ZhcG1GeoKU6GV6t5j4vCZ0UELFQi7b5FwUuiKruedMQD3lKo0CaDNXcOAXVy rvj/548adyDQVqZ3jC0A2ZhTiCbcppDGXSeSYUEvWbrRQ37o/hSEVZ5TihHB9gwN37khMkiJx 4HKgPIJbhAzJCzbqLUFLo4s4ro/wwu3a2IEqrpDh4dZS0X7HaBbxcsiYpIW76xUryMI032C4L /fS/o+2YTuntvBcY2cEtPiv1vrSRStAIoTUE6SesdOJUA9s6WR1Hhb6rPjN2Gdjq2AmjlSl+P LObSHFnaAfZFPGSZ/6FOI5kByL0K/ziON0iQoZlJZZOnPHLgWc49x7wfQSI4y0pUbwGQViyzj u67gzFDtbV5D7Xll11uQ== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean At the beginning of close_ctree_fs_info() the value 0 is assigned to err and never changed before testing it. Let's get rid of the superfluous variable. Fixes: f06bfcf54d0e ("fs: btrfs: Crossport open_ctree_fs_info() from btrfs-progs") Signed-off-by: Heinrich Schuchardt Reviewed-by: Qu Wenruo --- fs/btrfs/disk-io.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- 2.29.2 diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 01e7cee520..b332ecb796 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1030,7 +1030,6 @@ out: int close_ctree_fs_info(struct btrfs_fs_info *fs_info) { int ret; - int err = 0; free_fs_roots_tree(&fs_info->fs_root_tree); @@ -1038,9 +1037,7 @@ int close_ctree_fs_info(struct btrfs_fs_info *fs_info) ret = btrfs_close_devices(fs_info->fs_devices); btrfs_cleanup_all_caches(fs_info); btrfs_free_fs_info(fs_info); - if (!err) - err = ret; - return err; + return ret; } int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid)