From patchwork Fri Jan 5 09:20:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 185183 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp5966022dyb; Thu, 4 Jan 2024 17:26:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IHBLXEBsdhB+jTqbFqkA64Uz01iAxsS51a6/+kXtYUtW2cjhmAk8ufd1TNuek2WQPfquntm X-Received: by 2002:a05:620a:24d1:b0:781:18a2:f763 with SMTP id m17-20020a05620a24d100b0078118a2f763mr1802858qkn.30.1704417969515; Thu, 04 Jan 2024 17:26:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704417969; cv=none; d=google.com; s=arc-20160816; b=SvQDT+gLJl5sYavjtZP4YysT3nx4CXjhCsjr/hwAPuDetGChzmivmPKsFl7Iwitk6F nE9Nh6HkIuIImWF4VRDOytiUHqivB0E7jozaDq26j/IvLRMjtA/xv9yXLW8O2+XR1xIz FrAh9LQapEkZB1SzpWtvIZnuRQsWEpqWmkYpN2YHduo4rWMH20oAgxmOFuL4dtowzZZb sHIxhI3GDSBIJOaQKv3XAqT0rUgyaZS8GbehHgCu3h+f0EEP+1ggAJJlNNqpDmccGdHW h2vNmMOWHR2xipX5LNKOZUtfTNYw462TldPpMiiyeTRHbCClu6A2RVTt5iEcQ5fbpj1K lDEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=4G3gpilyXOAmlMQ5wR4EVx+4PZWExr7LIj8+95GLbdI=; fh=PiOAScoVKHwkMbfmvV1/7R62FPuyEpEVQGzFlL5CMdw=; b=hgfvNBPAShSPpgcUehs/j/iosM3LjDJFPblxG8CPB0HNfXHaE2YheWtWVSbZEQRqkT jI5ojkI1S3l+BC/wAO//bVv+pACCuFwnIsTLsNAuZQOKYoFKA+XxCi81p8ErMEEouML4 892oaEN9v3mtwbHDCLUExAfkaKhyxvbu5bDooF+Av/kfgB054jBkPq1PHLIRoU1JLC2x h7jRpvFLv7Rs3H2Hpbl1lk7oxsE/4ppz8dTNtOzD/gc38EqjBju/VkIxYZ0TFSB25umy 0rSfWm+7ms+CCBTAk5Uvp23Z9DePeIG5tder6yXxJNMP0oUTncutsCZw0a+y/2KzmFQF wv1A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-17384-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17384-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id g17-20020ae9e111000000b00781e6c8866dsi690688qkm.541.2024.01.04.17.26.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 17:26:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-17384-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-17384-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17384-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 4E58E1C225E9 for ; Fri, 5 Jan 2024 01:26:09 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 49E8924B20; Fri, 5 Jan 2024 01:23:09 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 88B54440E; Fri, 5 Jan 2024 01:23:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4T5m0w63Vqz4f3kG1; Fri, 5 Jan 2024 09:22:56 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 302731A088D; Fri, 5 Jan 2024 09:23:00 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBXZUXyWZdl68i0Fg--.35140S3; Fri, 05 Jan 2024 09:23:00 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/9] ext4: remove unused return value of __mb_check_buddy Date: Fri, 5 Jan 2024 17:20:54 +0800 Message-Id: <20240105092102.496631-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240105092102.496631-1-shikemeng@huaweicloud.com> References: <20240105092102.496631-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBXZUXyWZdl68i0Fg--.35140S3 X-Coremail-Antispam: 1UD129KBjvJXoW7tF4xGF4Uuw1DWF45Kw4rXwb_yoW8GFWfpF sxua4Uur4vgFnruw47Kw1DWFyIqw1I9ay7GryF9w1UJr13GrsY9F95KFyYvF1rAFWrGF13 Aa15Zry3Cr1xCFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB0b4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK 8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I 0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUsgyZUUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787211776870636189 X-GMAIL-MSGID: 1787211776870636189 Remove unused return value of __mb_check_buddy. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- fs/ext4/mballoc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 454d56126..9f9b8dd06 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -677,7 +677,7 @@ do { \ } \ } while (0) -static int __mb_check_buddy(struct ext4_buddy *e4b, char *file, +static void __mb_check_buddy(struct ext4_buddy *e4b, char *file, const char *function, int line) { struct super_block *sb = e4b->bd_sb; @@ -696,7 +696,7 @@ static int __mb_check_buddy(struct ext4_buddy *e4b, char *file, void *buddy2; if (e4b->bd_info->bb_check_counter++ % 10) - return 0; + return; while (order > 1) { buddy = mb_find_buddy(e4b, order, &max); @@ -758,7 +758,7 @@ static int __mb_check_buddy(struct ext4_buddy *e4b, char *file, grp = ext4_get_group_info(sb, e4b->bd_group); if (!grp) - return NULL; + return; list_for_each(cur, &grp->bb_prealloc_list) { ext4_group_t groupnr; struct ext4_prealloc_space *pa; @@ -768,7 +768,6 @@ static int __mb_check_buddy(struct ext4_buddy *e4b, char *file, for (i = 0; i < pa->pa_len; i++) MB_CHECK_ASSERT(mb_test_bit(k + i, buddy)); } - return 0; } #undef MB_CHECK_ASSERT #define mb_check_buddy(e4b) __mb_check_buddy(e4b, \ From patchwork Fri Jan 5 09:20:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 185184 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp5966070dyb; Thu, 4 Jan 2024 17:26:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IG7llyr0NySVEJ12fOniFrswpQ/vp56Z3wK9cAmDRYf3PFWufvEEt6lXerip5utzVlIfxLt X-Received: by 2002:a17:90a:e294:b0:28b:de50:b4a7 with SMTP id d20-20020a17090ae29400b0028bde50b4a7mr1221033pjz.76.1704417977811; Thu, 04 Jan 2024 17:26:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704417977; cv=none; d=google.com; s=arc-20160816; b=rWDcDZG7+b6n4WfQvw2t9dIPb0Y8hanbI5X+yNDxZYagyc1ceKp+SPEnIMAD/nqd/j 5Y/vQc0OOtN31AS52b7gw8eSJrOk/kL0N+RTB9I7hihBVdAnt3w69Q0ECMcclaflcoHq Xq0stiZwIpoQs6NlpxY2HqosTQByz+wVzmu9TZtKCLAWbmDPyS3/X3UwJzh2ahqcCRlN c53x2wMFaNnN5MGHK0eYiY9x22/CIIxThlcv0We2xNZ6TTL++mtkkRWbsACg8YkwHo25 oivBHcJ3m59UJoKi870Gm1zRBkDQ5sq111TW+C3gnxP5TJ+auqqfDBkeNweJj+f3MdkF dVfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=tbmChUGQoOahBMSL9JV3RAGIneBnL/32r+KC2vv29/8=; fh=PiOAScoVKHwkMbfmvV1/7R62FPuyEpEVQGzFlL5CMdw=; b=fC0WXMBmIc2HeAxJWd9MS36DTZ54Tj7VFyx/NQqUmv+elKIhkctgyUfqfl0hpuWMUl 1A6rfUC2CJLF7NIAkpujfWCCXp4fuA/OTHPc8aLwfSHtnISpXxL7QXcDTTisb1yM1BrK VlFXC3pSkKXgtszOAbGV8PQIHEEwHRdQebDqccy2JFCtuBJaQQNorgwj/mhtbWLaLpmY G8kGimrcHWnDvGSoVEBywcKvhmiDvoitjGJt/kB9zHCTkvjelIIS1ENQGun5+5ZE+xJv NjG1+bmXmNPytcpCLCS1K6/xZTxmS9LyXmPlcvmOx8piPr2mIHNbVXUYwZ0RqIbKsbDv BRLg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-17382-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17382-ouuuleilei=gmail.com@vger.kernel.org" Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id ju8-20020a170903428800b001d09ffdfe1fsi394203plb.171.2024.01.04.17.26.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 17:26:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-17382-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-17382-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17382-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id A4666B2426D for ; Fri, 5 Jan 2024 01:24:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C46661D685; Fri, 5 Jan 2024 01:23:07 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F8674428; Fri, 5 Jan 2024 01:23:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4T5m0t5Mtgz4f3lW9; Fri, 5 Jan 2024 09:22:54 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 762001A08B6; Fri, 5 Jan 2024 09:23:00 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBXZUXyWZdl68i0Fg--.35140S4; Fri, 05 Jan 2024 09:23:00 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/9] ext4: remove unused parameter ngroup in ext4_mb_choose_next_group_*() Date: Fri, 5 Jan 2024 17:20:55 +0800 Message-Id: <20240105092102.496631-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240105092102.496631-1-shikemeng@huaweicloud.com> References: <20240105092102.496631-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBXZUXyWZdl68i0Fg--.35140S4 X-Coremail-Antispam: 1UD129KBjvJXoWxAr13Cr47Zr47ArWxAr45Awb_yoW5GF15pF 4DtF1Uu3yfGF1DuF4xW39Fg3WxKw18uryUAry3Wa4F9ryxJrykJF47tF40yF1UCFs7urnx Xas0v348Ca17C3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB0b4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK 8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I 0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU3K9-UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787211785514461474 X-GMAIL-MSGID: 1787211785514461474 Remove unused parameter ngroup in ext4_mb_choose_next_group_*(). Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 9f9b8dd06..765b62729 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -870,7 +870,7 @@ mb_update_avg_fragment_size(struct super_block *sb, struct ext4_group_info *grp) * cr level needs an update. */ static void ext4_mb_choose_next_group_p2_aligned(struct ext4_allocation_context *ac, - enum criteria *new_cr, ext4_group_t *group, ext4_group_t ngroups) + enum criteria *new_cr, ext4_group_t *group) { struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb); struct ext4_group_info *iter; @@ -944,7 +944,7 @@ ext4_mb_find_good_group_avg_frag_lists(struct ext4_allocation_context *ac, int o * order. Updates *new_cr if cr level needs an update. */ static void ext4_mb_choose_next_group_goal_fast(struct ext4_allocation_context *ac, - enum criteria *new_cr, ext4_group_t *group, ext4_group_t ngroups) + enum criteria *new_cr, ext4_group_t *group) { struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb); struct ext4_group_info *grp = NULL; @@ -989,7 +989,7 @@ static void ext4_mb_choose_next_group_goal_fast(struct ext4_allocation_context * * much and fall to CR_GOAL_LEN_SLOW in that case. */ static void ext4_mb_choose_next_group_best_avail(struct ext4_allocation_context *ac, - enum criteria *new_cr, ext4_group_t *group, ext4_group_t ngroups) + enum criteria *new_cr, ext4_group_t *group) { struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb); struct ext4_group_info *grp = NULL; @@ -1124,11 +1124,11 @@ static void ext4_mb_choose_next_group(struct ext4_allocation_context *ac, } if (*new_cr == CR_POWER2_ALIGNED) { - ext4_mb_choose_next_group_p2_aligned(ac, new_cr, group, ngroups); + ext4_mb_choose_next_group_p2_aligned(ac, new_cr, group); } else if (*new_cr == CR_GOAL_LEN_FAST) { - ext4_mb_choose_next_group_goal_fast(ac, new_cr, group, ngroups); + ext4_mb_choose_next_group_goal_fast(ac, new_cr, group); } else if (*new_cr == CR_BEST_AVAIL_LEN) { - ext4_mb_choose_next_group_best_avail(ac, new_cr, group, ngroups); + ext4_mb_choose_next_group_best_avail(ac, new_cr, group); } else { /* * TODO: For CR=2, we can arrange groups in an rb tree sorted by From patchwork Fri Jan 5 09:20:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 185180 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp5965542dyb; Thu, 4 Jan 2024 17:24:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IETtPXTFLo0BgtHCv1t00v/VYKvhCmMIqn53Uy/R/dYaEiT0VPwsjSs40N3zpRZ4fzExgOC X-Received: by 2002:ac8:5cd1:0:b0:429:7417:86aa with SMTP id s17-20020ac85cd1000000b00429741786aamr1398971qta.45.1704417869649; Thu, 04 Jan 2024 17:24:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704417869; cv=none; d=google.com; s=arc-20160816; b=DBPmwY1fQy32txMUDh45oSFsxaBg3pOCL6nOMZkuBJEh0lHWrgP77sEqAkP+Lp5tBY f81ZjGxVgGVBAdiEkclaBeWb/z1gR22jz0uYkH1e7JQaLv1Q+YmMvN3yqaAe4YnS0MOl 3CXGR+14Vs7UOeOu/m47/pJV8otWOaHIR7rnBzy7ltt0Lz0mvAAlTRDvgBA5Y3bM8zux 24mlVeaGZPpeA+FPrxuSOs63cGrqjtvwuUVEgbb+kO45Us1pPXSOSit5lwtA+PvD+rTV i99QOipjUBpES1RTNdCoVBDeNQ+SVP36sJ+Qbsz22uHRyp9PRSF+036Sg1ACQ5NosVV3 1VaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=ygu+Ni049dXUTqf5tyaVoL52m5xDumRSvhHGhLo4I4g=; fh=PiOAScoVKHwkMbfmvV1/7R62FPuyEpEVQGzFlL5CMdw=; b=MjdIgw14hsoqw9Q3w2o5Y1kENVm8+u9TdQ1EEGxSw4T2G3RtYvfLjYuyx8TDfEmqwP kj/PaE/dJ2Yco1CHonIYO82p2KJtkFHOB9W1Vcdoys8BdQLEGWmTpFbDhTFW76X9MD5M 4o4cD0mFKyYbfBx9myUrsNQvuiVMhKyGrzCMagUFLS7+Czxbq/NWbHH4Nls3hHhbaptk W3hsUxmbeBINB1Yp9bSGGSdvawyyzXdQu9k53Iz+RYFslHNqylzUhUY6sTSBjPLtJusF zFa0oQ0TdfGcWuUwnZbHEb0ypejLTVMZKEisI9nT92z0OmWbjf/qClHmvSHSexMVjwvR oDZg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-17380-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17380-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id bv6-20020a05622a0a0600b00429763e619dsi711621qtb.430.2024.01.04.17.24.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 17:24:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-17380-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-17380-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17380-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 608DE1C22355 for ; Fri, 5 Jan 2024 01:24:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5C5A063BF; Fri, 5 Jan 2024 01:23:07 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E0AA442A; Fri, 5 Jan 2024 01:23:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4T5m0x3QS9z4f3khf; Fri, 5 Jan 2024 09:22:57 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id C88FD1A08D9; Fri, 5 Jan 2024 09:23:00 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBXZUXyWZdl68i0Fg--.35140S5; Fri, 05 Jan 2024 09:23:00 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/9] ext4: remove unneeded return value of ext4_mb_release_context Date: Fri, 5 Jan 2024 17:20:56 +0800 Message-Id: <20240105092102.496631-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240105092102.496631-1-shikemeng@huaweicloud.com> References: <20240105092102.496631-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBXZUXyWZdl68i0Fg--.35140S5 X-Coremail-Antispam: 1UD129KBjvJXoWrKFyfAr4UCrWUJw1rXFWkWFg_yoW8Jr48pr 4fJr48CF43WFn8uFsrW3Z5Ww1F93yI9F1UJ34Igw1fZFZ3JrykCF4Dta10qFyFyrW8GFn8 ZF4jqF4UJF4F937anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB0b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK 8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I 0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU3vPSUUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787211671757988718 X-GMAIL-MSGID: 1787211671757988718 Function ext4_mb_release_context always return 0 and the return value is never used. Just remove unneeded return value of ext4_mb_release_context. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- fs/ext4/mballoc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 765b62729..f79e87ad3 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5939,7 +5939,7 @@ static void ext4_mb_add_n_trim(struct ext4_allocation_context *ac) /* * release all resource we used in allocation */ -static int ext4_mb_release_context(struct ext4_allocation_context *ac) +static void ext4_mb_release_context(struct ext4_allocation_context *ac) { struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb); struct ext4_prealloc_space *pa = ac->ac_pa; @@ -5976,7 +5976,6 @@ static int ext4_mb_release_context(struct ext4_allocation_context *ac) if (ac->ac_flags & EXT4_MB_HINT_GROUP_ALLOC) mutex_unlock(&ac->ac_lg->lg_mutex); ext4_mb_collect_stats(ac); - return 0; } static int ext4_mb_discard_preallocations(struct super_block *sb, int needed) From patchwork Fri Jan 5 09:20:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 185181 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp5965985dyb; Thu, 4 Jan 2024 17:26:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IGAzer5EQYf0TUazS3b49es+/92jaVut+3dkn0TW/Tm+51KWTg5l14kvqJw56RG95I33HHb X-Received: by 2002:a05:6358:5248:b0:174:c7d3:6718 with SMTP id c8-20020a056358524800b00174c7d36718mr1325820rwa.12.1704417961373; Thu, 04 Jan 2024 17:26:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704417961; cv=none; d=google.com; s=arc-20160816; b=J/ZCqOT+Cy4Vda+ZHQOna5lWJ5QyQanPZGnM/SlzKKb61XMus6lJV29pzS3l/zP/lD 9duqOsW+aEut2mk/PA4n3JBjh5gx72RWLzVgwvdDsGLpMpDx02jO1zpgYFZwml+Oy25+ pWMZ0xEKzZL91NMom+p7J1dQ4JYrXxYXIm3BTvLM4fOvT57O+5MyaoG2Ooa4RS6UsGoJ o1TrnAnu5O1C0SmdoY3JKQAwdE4t+gRUWH/avORHy0V1OwN1kNNI0/JxGtxxLC6u+G// DEK6VWGSRRwsxiJTd6/ZTlDp8RXVhL8Dd1m+DbMs2OjFW4sTpnzHBZC3GrqAYyVVh0LP g+pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=DY6jyZnvgEKfao/vcsTMVTUB4bKrV24hXaku31vH/R4=; fh=PiOAScoVKHwkMbfmvV1/7R62FPuyEpEVQGzFlL5CMdw=; b=fs4iLbaac7MiVoobdhrLLn4xRJMtLUyQQ7ayO3Uhs6uTKNJwCtmpeHXPmYianEHK/Q 4fWgbaIBzBJfn5+JeLaQ5UgK+Q9QN5jxzNkeEIAzTS03bFBjOUUlDouIYYM5lHp4ua+k CdvsK+P2Tzi/5P8R6b9vaeoevX6KfguB/pcIJRGTqNSITvjodxe0+l9n4u51qjVbDMlp 04NqPziq3bSM7hif1oIPfCHQ9IFlqdvZ42fiFpiJTV4S2fO0c1O7OAVnOJJLNedTjEik uca7WLyX9flI10UbcyjCEO4QedevqYdGkoVMEoXQxu7Z++KRAE70FfyOWUaTN6RI7DQl aq3w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-17381-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17381-ouuuleilei=gmail.com@vger.kernel.org" Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id v189-20020a6389c6000000b005c668dc2426si472095pgd.176.2024.01.04.17.26.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 17:26:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-17381-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-17381-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17381-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 99DE1B23FF9 for ; Fri, 5 Jan 2024 01:24:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8AA74BE71; Fri, 5 Jan 2024 01:23:07 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D27F4403; Fri, 5 Jan 2024 01:23:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4T5m0z2VlSz4f3lXr; Fri, 5 Jan 2024 09:22:59 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 2637A1A08DB; Fri, 5 Jan 2024 09:23:01 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBXZUXyWZdl68i0Fg--.35140S6; Fri, 05 Jan 2024 09:23:00 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/9] ext4: remove unused ext4_allocation_context::ac_groups_considered Date: Fri, 5 Jan 2024 17:20:57 +0800 Message-Id: <20240105092102.496631-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240105092102.496631-1-shikemeng@huaweicloud.com> References: <20240105092102.496631-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBXZUXyWZdl68i0Fg--.35140S6 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYA7kC6x804xWl14x267AKxVWrJVCq3wAF c2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62 vIxIIY0VWUZVW8XwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E 14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI 8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vE x4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzx vE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWU JVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7V AKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr 1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU0TqcUUU UUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787211767878936240 X-GMAIL-MSGID: 1787211767878936240 Remove unused ext4_allocation_context::ac_groups_considered Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- fs/ext4/mballoc.h | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/ext4/mballoc.h b/fs/ext4/mballoc.h index d7aeb5da7..56938532b 100644 --- a/fs/ext4/mballoc.h +++ b/fs/ext4/mballoc.h @@ -192,7 +192,6 @@ struct ext4_allocation_context { */ ext4_grpblk_t ac_orig_goal_len; - __u32 ac_groups_considered; __u32 ac_flags; /* allocation hints */ __u16 ac_groups_scanned; __u16 ac_groups_linear_remaining; From patchwork Fri Jan 5 09:20:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 185182 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp5966013dyb; Thu, 4 Jan 2024 17:26:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IHHiRGlIVDR99TjUSQ3tr/8ItgpGbh/ijyq+tnpV7EUg9QUJFtgNPzr6gsGEEdodQTvr8os X-Received: by 2002:a05:6a20:9143:b0:197:4eac:4572 with SMTP id x3-20020a056a20914300b001974eac4572mr1377460pzc.75.1704417967958; Thu, 04 Jan 2024 17:26:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704417967; cv=none; d=google.com; s=arc-20160816; b=lpzvtHo3Y9MQN1kw+3mjwpVjz7UefDzvimoh/5ur55i9vG04tyz08Hn7+RBMIFDG3v aQ5eRL9Zp8JU0S5P/3zVe+zmIbpkbuV7y26jPtrB7NuTTzmR/m4R0J6kRcZbrWxxY5HF /GK2suk+oyWGDkro7+jyTdPiyEV9JjvnHJ+9uZlorIUqjxkZ/a5je2BbO4d5y5oDuK2/ lgqeX9Mo4HXXW8njCUbfKICIg6X4vqrT09+lRcdVEwf2kerWo77o5aUFnEYAJG8xk6JP KLG/G9rr0dbB7e9WnWsmFeIgOsbcrxIxRAUTxcWJltvfo9nwT97xt5Elz97ekhwUe4PU n8kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=U0FMHs7iHvfUdhDoRlS6M7R0Xo54lsKs/GiJ34BdV2A=; fh=PiOAScoVKHwkMbfmvV1/7R62FPuyEpEVQGzFlL5CMdw=; b=uGcNjLygDvTVxjWWskOflTo5NZeHQqSe+bJq11zBlwh/fnzOtequlEyp5SStHlvR3r RKGj/kY0dfQVfEbZsXtksa0zTetzs9TyzqYhekldjiG+nonmxmqssS0YfHChwHc1hky4 zes/xH6zYQnn7OMZdj4gGWqQ+Zn8ix7nnkwWZ7PnKFCNMsJcUWN8jeU8XgXI8hAQVRPV lcl3AOu5rtp3midQU1qC/20m9C0zTd+TPPI7NNjxSeEKKvqPB59PIT4PCNllly9JSX/a qXrpY+8OPcGd155NCP3G//W24ITsIPeqq7fB7CiGtpktGplwszQ/q0VIesrBm3cy94JT GMyA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-17385-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17385-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id j23-20020a170902759700b001d0050e2452si377435pll.45.2024.01.04.17.26.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 17:26:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-17385-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-17385-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17385-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id B9A57284C07 for ; Fri, 5 Jan 2024 01:26:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 41A8924A0E; Fri, 5 Jan 2024 01:23:09 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D25546A1; Fri, 5 Jan 2024 01:23:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4T5m0z6xy5z4f3lY3; Fri, 5 Jan 2024 09:22:59 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id BF2211A0B7F; Fri, 5 Jan 2024 09:23:01 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBXZUXyWZdl68i0Fg--.35140S8; Fri, 05 Jan 2024 09:23:01 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 6/9] ext4: remove unused return value of ext4_mb_release_inode_pa Date: Fri, 5 Jan 2024 17:20:59 +0800 Message-Id: <20240105092102.496631-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240105092102.496631-1-shikemeng@huaweicloud.com> References: <20240105092102.496631-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBXZUXyWZdl68i0Fg--.35140S8 X-Coremail-Antispam: 1UD129KBjvdXoWrKFyfCw4DtFW7WF43WFW5Awb_yoWDWwc_GF yjyr4xGryfZ34fu3Z5K345tFZYkan3Zr13ZF4rtrZ5Z3WrXan5uw1DArn8CrW7Ww4xCFy3 Crn7Jr18KFWSgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbS8YFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jstxDUUUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787211775062274973 X-GMAIL-MSGID: 1787211775062274973 Remove unused return value of ext4_mb_release_inode_pa Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- fs/ext4/mballoc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 8d6246db3..1ed6d1d5a 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5278,7 +5278,7 @@ static void ext4_mb_new_preallocation(struct ext4_allocation_context *ac) * the caller MUST hold group/inode locks. * TODO: optimize the case when there are no in-core structures yet */ -static noinline_for_stack int +static noinline_for_stack void ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh, struct ext4_prealloc_space *pa) { @@ -5328,8 +5328,6 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh, */ } atomic_add(free, &sbi->s_mb_discarded); - - return 0; } static noinline_for_stack int From patchwork Fri Jan 5 09:21:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 185185 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp5966086dyb; Thu, 4 Jan 2024 17:26:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IF7LT2xuljEl3bEFHj3jPRv/7P79Wo2nWlWyFufK4XIQws13uoqqN3nsn4ydQ/im4rWWd88 X-Received: by 2002:a50:d48b:0:b0:557:2069:db87 with SMTP id s11-20020a50d48b000000b005572069db87mr221776edi.57.1704417980515; Thu, 04 Jan 2024 17:26:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704417980; cv=none; d=google.com; s=arc-20160816; b=f0+o6kOmRR33q0e2B98xjHDKCxKSR4D4DjjZVEEiCJKwP7mwtk3hbfzawPtdFG3OhK JIkuwnW3cTk88O8IOD9aI8g+6E9ACCyj0sQchmkBbqNhxjzvO+j8SEMMSmqK5ROF3zxd 2K6VUKf2LOY+ddpPI1PORqFpF44H0sAyDuH4ChAy6KXnKlxUjNWUw1jQP1TU7U87ijai Lu44z03FTEHUJPIAfG5wBmjH+02i6UslBQ/jml+gX0aVRzzVtrgxoMu/dTQXUXIObqob R6ls+YL9DjpK/k2Duf5+QcdRJVZruzve7AiO5PdoNapDj+niE7wfI2mTtogW90NvN060 f1uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=o5gSoBfyeKv9lmW69uc6LgKRNWjJqz8CVcds32loO44=; fh=PiOAScoVKHwkMbfmvV1/7R62FPuyEpEVQGzFlL5CMdw=; b=p8Bwh2DxpILpioHpjWeupgGNX9xs8H4ziCYk0wlwaYyYoOxzqzffdDylfZ3bxfFCoI E+PM2BQMAAkwe4oBZGL+iR3S6hZSBx1BarCEFi68Tg01Yls5EYidMGmkHQ1wLFhZc14c 0lLpdM3zxVKop9LLah8gHT3IX7QWeIGnLVYaNpAGVtnktM/Y0hFc/Qe0uKOtFYcZYXyV wJIZCyc377V2FkLdjf9J05I56NDH6SD1cKtSXDQUQgYELou4FqItNXplBvwdZqJs9PlA tUb7KT/VmPORFn2XjkWN/7kLUQH9agwYYeydmA+Wn6bUPrXqT2KwuBR8stZUPXS0xNqN ifdg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-17388-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17388-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id ec45-20020a0564020d6d00b0055398b5653csi243056edb.198.2024.01.04.17.26.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 17:26:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-17388-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-17388-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17388-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 220E01F21D40 for ; Fri, 5 Jan 2024 01:26:20 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 803B32746D; Fri, 5 Jan 2024 01:23:09 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C96346B3; Fri, 5 Jan 2024 01:23:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4T5m0y5WZgz4f3lwP; Fri, 5 Jan 2024 09:22:58 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 1B12E1A0531; Fri, 5 Jan 2024 09:23:02 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBXZUXyWZdl68i0Fg--.35140S9; Fri, 05 Jan 2024 09:23:01 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 7/9] ext4: remove unused return value of ext4_mb_release_group_pa Date: Fri, 5 Jan 2024 17:21:00 +0800 Message-Id: <20240105092102.496631-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240105092102.496631-1-shikemeng@huaweicloud.com> References: <20240105092102.496631-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBXZUXyWZdl68i0Fg--.35140S9 X-Coremail-Antispam: 1UD129KBjvdXoWrtr4fGF45tF4UXFWxZF1xAFb_yoWkKFb_Ca 4UXr4kA343A3s293WrJry3t3yqkan2vr9rur4rKrZ3AF1rW3ZxAw1DZrsxA397ua10ka43 GF93Zry8GFZYqjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbS8YFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jstxDUUUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787211788294113317 X-GMAIL-MSGID: 1787211788294113317 Remove unused return value of ext4_mb_release_group_pa. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- fs/ext4/mballoc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 1ed6d1d5a..e6561a09d 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5330,7 +5330,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh, atomic_add(free, &sbi->s_mb_discarded); } -static noinline_for_stack int +static noinline_for_stack void ext4_mb_release_group_pa(struct ext4_buddy *e4b, struct ext4_prealloc_space *pa) { @@ -5344,13 +5344,11 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b, if (unlikely(group != e4b->bd_group && pa->pa_len != 0)) { ext4_warning(sb, "bad group: expected %u, group %u, pa_start %llu", e4b->bd_group, group, pa->pa_pstart); - return 0; + return; } mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len); atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded); trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len); - - return 0; } /* From patchwork Fri Jan 5 09:21:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 185187 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp5966620dyb; Thu, 4 Jan 2024 17:28:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IHq9CWDxmKgDhCuJERshgMUSw5cTSFPQTHlyV7sQ94cT0HuRZY1L7lPqdjhQ/AvVTIALfa7 X-Received: by 2002:a05:6a20:160a:b0:199:338f:25f0 with SMTP id l10-20020a056a20160a00b00199338f25f0mr455857pzj.29.1704418084494; Thu, 04 Jan 2024 17:28:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704418084; cv=none; d=google.com; s=arc-20160816; b=ceVO7hUo0TtJP0dQxigJ3M5jqLO/Qvf/mEt7OkrgkmdDmy/alk7BZ6RGBG/suHZd5r 0VedhUscb5zAWd2SG4lXmCU9JAr9yiCrTTLc+3C5mCfpmORYfD+OY54VAH4B5UsbhZ6a yX5UWkWAM/N4FW3M8uDBuhPhPB32vpBdsVk3vQJoxvfrYUYnTt7OOMsBraN1rt0ZCIVu l/YraoiPk7POFZoAFQk2DIG30kfcy19ksx6u7wdG7FBrh91KdZVNMiFj6czTxurmUlli R/XW7MzHbmwxbwf9jbaCeEngNBiEE/84jG6YDJY9PeGPqdElH4nWm6uLr8Vj+yhKqtRL pEOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=ZqPkop0fEjRXjwkHjsQEKVkekQ2aEzFUsZ//IjlQy8w=; fh=PiOAScoVKHwkMbfmvV1/7R62FPuyEpEVQGzFlL5CMdw=; b=dIG+hduaEUPVkymCPAIWRh9MznNprIbhmq6J4/DHFfIuX7BOLjd3EDb8S+kKwceN/L JTa+gdYuY/EQZ+StB5QRI4vmKxYjx8ARBu+hlU6FXAGbBjUxaCuXoQg4Cjkj4G31v9+K GfDsee1xwe5XEIgQemLHS6msKo6SFXIXcc7gVCEyZ0XaZ6sTdbevepx6sOP77dZua5bN KzUR2tyPtuiVYkbbQre9miPrMBtftpLX6H+hmAyOtO4w4bQ+hJFkEe78sk9ou9dwVuKb 4JmrxvQyKT91v1h7VZDWkI0iSKBDEuJzsz8FO4YTDl8xxmqC+vaGxfu0maSlogtFhnQI IFmQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-17387-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17387-ouuuleilei=gmail.com@vger.kernel.org" Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id w12-20020a17090a8a0c00b0028b77a3eb52si504209pjn.134.2024.01.04.17.28.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 17:28:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-17387-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-17387-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17387-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 50298B25254 for ; Fri, 5 Jan 2024 01:26:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 51EB1250F9; Fri, 5 Jan 2024 01:23:09 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7472B46B8; Fri, 5 Jan 2024 01:23:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4T5m0z2XrNz4f3mHv; Fri, 5 Jan 2024 09:22:59 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id AA78A1A0A41; Fri, 5 Jan 2024 09:23:02 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBXZUXyWZdl68i0Fg--.35140S11; Fri, 05 Jan 2024 09:23:02 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 9/9] ext4: remove 'needed' in trace_ext4_discard_preallocations Date: Fri, 5 Jan 2024 17:21:02 +0800 Message-Id: <20240105092102.496631-10-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240105092102.496631-1-shikemeng@huaweicloud.com> References: <20240105092102.496631-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBXZUXyWZdl68i0Fg--.35140S11 X-Coremail-Antispam: 1UD129KBjvJXoW7Kr43tF4fZrykCw4fAw13Jwb_yoW8tw1rpr nrA3W8Ww43Z39Y9a1xZw18Zr45Zay09anrJrWSgw1UZF9rJF93KrnFqr1jyFyrArZYkFWS va4a9Fy5Zw18W37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBIb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3w A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwCI42IY 6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aV CY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU0TqcUUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787211897606799728 X-GMAIL-MSGID: 1787211897606799728 As 'needed' to trace_ext4_discard_preallocations is always 0 which is meaningless. Just remove it. Signed-off-by: Kemeng Shi Suggested-by: Jan Kara Reviewed-by: Jan Kara --- fs/ext4/mballoc.c | 5 ++--- include/trace/events/ext4.h | 11 ++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 0e6beb3b4..091a832a8 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5481,9 +5481,8 @@ void ext4_discard_preallocations(struct inode *inode) struct rb_node *iter; int err; - if (!S_ISREG(inode->i_mode)) { + if (!S_ISREG(inode->i_mode)) return; - } if (EXT4_SB(sb)->s_mount_state & EXT4_FC_REPLAY) return; @@ -5491,7 +5490,7 @@ void ext4_discard_preallocations(struct inode *inode) mb_debug(sb, "discard preallocation for inode %lu\n", inode->i_ino); trace_ext4_discard_preallocations(inode, - atomic_read(&ei->i_prealloc_active), 0); + atomic_read(&ei->i_prealloc_active)); repeat: /* first, collect all pa's in the inode */ diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h index 65029dfb9..a697f4b77 100644 --- a/include/trace/events/ext4.h +++ b/include/trace/events/ext4.h @@ -772,15 +772,14 @@ TRACE_EVENT(ext4_mb_release_group_pa, ); TRACE_EVENT(ext4_discard_preallocations, - TP_PROTO(struct inode *inode, unsigned int len, unsigned int needed), + TP_PROTO(struct inode *inode, unsigned int len), - TP_ARGS(inode, len, needed), + TP_ARGS(inode, len), TP_STRUCT__entry( __field( dev_t, dev ) __field( ino_t, ino ) __field( unsigned int, len ) - __field( unsigned int, needed ) ), @@ -788,13 +787,11 @@ TRACE_EVENT(ext4_discard_preallocations, __entry->dev = inode->i_sb->s_dev; __entry->ino = inode->i_ino; __entry->len = len; - __entry->needed = needed; ), - TP_printk("dev %d,%d ino %lu len: %u needed %u", + TP_printk("dev %d,%d ino %lu len: %u", MAJOR(__entry->dev), MINOR(__entry->dev), - (unsigned long) __entry->ino, __entry->len, - __entry->needed) + (unsigned long) __entry->ino, __entry->len) ); TRACE_EVENT(ext4_mb_discard_preallocations,