From patchwork Tue Feb 21 20:30:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 60028 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1839011wrn; Tue, 21 Feb 2023 04:42:08 -0800 (PST) X-Google-Smtp-Source: AK7set+2WENTXD+BRmV6/xxuec1SXy+V1zdUNniuEDvZyA3VtLEiA71feyyRRyHJT3p4VqEzr33E X-Received: by 2002:aa7:9466:0:b0:5aa:4df7:7ef6 with SMTP id t6-20020aa79466000000b005aa4df77ef6mr5222207pfq.7.1676983327788; Tue, 21 Feb 2023 04:42:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676983327; cv=none; d=google.com; s=arc-20160816; b=GCU8+zx5L17oPSI4DarwQRMwMBnavTTvRZgGWFYFFWhhKMHwrsMqu/tNUBTizHULgf ok8edHVdyXsWIfdhCMOuz2sQ6dxl3pxmoRKb6MAbepfMkuaetru+0vYEMnB4FIjDB993 kvuo64eowNbm3vt5b+cWWG2QNX8gC/8zgzOg5D/y77+8GckJAAAMbqIxL2B+WV68aqTi SSJ/SYBXDt9JPunJEAzTlbB/cc07k+x0PiXY/5ViNT8enzaRPuIoxNsj5eG+cBZnTH1u v3Gy+G7o0KBx9Zqfmy37SDGn90RugSO2JisSC7WF/mvswAljissHr8KGueyArim1pkOB 8XyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=7Jx+AkY2PF1+jd1BihdFJ1A/5mHBrrdgEaxTOYSRNpE=; b=Rkmz4RnA3ZhR1ZTbTHdfrujQt+clucXlNMeGAin3GquEICB/ECZJVLK/VwSYGWDGBP 28bgISTtb5riFnu55TZWAa7h+UqSYTNIGuT/CD0Jq9TzflXvAJdkU1A/iFET5u/pkt9P qF/lUIIiNAt2qgZ9Vt5OQloAACSdQqbG4TH5QnxKjZ33uIukXv8tK7ziamKiKdWJbOKL OlQ3jhpAFYgjc5MGPukmKeTS4YJo8oGHIP/dcFlSy9WnV1u/b2VaJYCqmDsEl+o5XzW/ FIpz9WicQEc+pWI0XaSHS5LUgwMU/UjVZblVsm7eEF+74+AsTAcwKk5TJcCZu+X0Pfou gT/w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y129-20020a62ce87000000b005a8f259220asi17337631pfg.66.2023.02.21.04.41.53; Tue, 21 Feb 2023 04:42:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234697AbjBUM3K (ORCPT + 99 others); Tue, 21 Feb 2023 07:29:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234187AbjBUM3B (ORCPT ); Tue, 21 Feb 2023 07:29:01 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9874028D13; Tue, 21 Feb 2023 04:28:47 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PLdqs6LpDz4f41Gs; Tue, 21 Feb 2023 20:28:41 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgAXC+n5uPRj1aP2Dw--.36592S5; Tue, 21 Feb 2023 20:28:43 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com, linfeilong@huawei.com Subject: [PATCH 3/4] ext4: remove unused group parameter in ext4_block_bitmap_csum_verify Date: Wed, 22 Feb 2023 04:30:26 +0800 Message-Id: <20230221203027.2359920-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230221203027.2359920-1-shikemeng@huaweicloud.com> References: <20230221203027.2359920-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgAXC+n5uPRj1aP2Dw--.36592S5 X-Coremail-Antispam: 1UD129KBjvJXoWxJrW5ZFW5Wr1xCr13WF4fuFg_yoW8ZF1kp3 Z0yF1Uur43urnrua17Kry0v3WIgw1kKrykGryF9345WFW7Jwn7WFykKF1DAa4YqFZxXFnr ZF1Yy34UWw1fWrDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPSb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zV CS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E 5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAV WUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY 1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI 0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7s RNiiSUUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758444470255238992?= X-GMAIL-MSGID: =?utf-8?q?1758444470255238992?= Remove unused group parameter in ext4_block_bitmap_csum_verify. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- fs/ext4/balloc.c | 3 +-- fs/ext4/bitmap.c | 2 +- fs/ext4/ext4.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index 689edfed231a..49fdb758b0e4 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c @@ -385,8 +385,7 @@ static int ext4_validate_block_bitmap(struct super_block *sb, ext4_lock_group(sb, block_group); if (buffer_verified(bh)) goto verified; - if (unlikely(!ext4_block_bitmap_csum_verify(sb, block_group, - desc, bh) || + if (unlikely(!ext4_block_bitmap_csum_verify(sb, desc, bh) || ext4_simulate_fail(sb, EXT4_SIM_BBITMAP_CRC))) { ext4_unlock_group(sb, block_group); ext4_error(sb, "bg %u: bad block bitmap checksum", block_group); diff --git a/fs/ext4/bitmap.c b/fs/ext4/bitmap.c index 0186b894f5b3..3b83d979a650 100644 --- a/fs/ext4/bitmap.c +++ b/fs/ext4/bitmap.c @@ -54,7 +54,7 @@ void ext4_inode_bitmap_csum_set(struct super_block *sb, gdp->bg_inode_bitmap_csum_hi = cpu_to_le16(csum >> 16); } -int ext4_block_bitmap_csum_verify(struct super_block *sb, ext4_group_t group, +int ext4_block_bitmap_csum_verify(struct super_block *sb, struct ext4_group_desc *gdp, struct buffer_head *bh) { diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index aa6948d12ede..04447640b4f4 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2685,7 +2685,7 @@ int ext4_inode_bitmap_csum_verify(struct super_block *sb, void ext4_block_bitmap_csum_set(struct super_block *sb, ext4_group_t group, struct ext4_group_desc *gdp, struct buffer_head *bh); -int ext4_block_bitmap_csum_verify(struct super_block *sb, ext4_group_t group, +int ext4_block_bitmap_csum_verify(struct super_block *sb, struct ext4_group_desc *gdp, struct buffer_head *bh);