From patchwork Mon May 17 09:46:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Li X-Patchwork-Id: 12261337 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3021C43461 for ; Mon, 17 May 2021 09:46:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D19BE611CA for ; Mon, 17 May 2021 09:46:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236191AbhEQJsM (ORCPT ); Mon, 17 May 2021 05:48:12 -0400 Received: from out30-42.freemail.mail.aliyun.com ([115.124.30.42]:33043 "EHLO out30-42.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236075AbhEQJsM (ORCPT ); Mon, 17 May 2021 05:48:12 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R441e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e01424;MF=yang.lee@linux.alibaba.com;NM=1;PH=DS;RN=10;SR=0;TI=SMTPD_---0UZ7JUQq_1621244812; Received: from j63c13417.sqa.eu95.tbsite.net(mailfrom:yang.lee@linux.alibaba.com fp:SMTPD_---0UZ7JUQq_1621244812) by smtp.aliyun-inc.com(127.0.0.1); Mon, 17 May 2021 17:46:54 +0800 From: Yang Li To: clm@fb.com Cc: josef@toxicpanda.com, dsterba@suse.com, nathan@kernel.org, ndesaulniers@google.com, linux-btrfs@vger.kernel.org, lukas.bulwahn@gmail.com, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, Yang Li Subject: [PATCH v2] btrfs: Remove redundant initialization of 'to_add' Date: Mon, 17 May 2021 17:46:50 +0800 Message-Id: <1621244810-38832-1-git-send-email-yang.lee@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Variable 'to_add' is being initialized however this value is never read as 'to_add' is assigned a new value in if statement. Remove the redundant assignment. At the same time, move its declaration into the if statement, because the variable is not used elsewhere. Clean up clang warning: fs/btrfs/extent-tree.c:2774:8: warning: Value stored to 'to_add' during its initialization is never read [clang-analyzer-deadcode.DeadStores] Reported-by: Abaci Robot Signed-off-by: Yang Li --- Change in v2: --According to Lukas's suggestion, combine the declaration and assignment of variable 'to_add' into one line, just as "u64 to_add = min(len, ...);" https://lore.kernel.org/patchwork/patch/1428697/ fs/btrfs/extent-tree.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index f1d15b6..13ac978 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -2774,11 +2774,9 @@ static int unpin_extent_range(struct btrfs_fs_info *fs_info, spin_unlock(&cache->lock); if (!readonly && return_free_space && global_rsv->space_info == space_info) { - u64 to_add = len; - spin_lock(&global_rsv->lock); if (!global_rsv->full) { - to_add = min(len, global_rsv->size - + u64 to_add = min(len, global_rsv->size - global_rsv->reserved); global_rsv->reserved += to_add; btrfs_space_info_update_bytes_may_use(fs_info,