From nobody Mon Feb 9 03:58:56 2026 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 28AA71B6CF6; Tue, 24 Dec 2024 12:29:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735043357; cv=none; b=Zt906AqPB+xV9KjyqdqjM/d7wwapHYKIbCE10EhN0E1DFLdyresZDsJ+z7oVX2nps3BF0LL7GdT5Ds4/YIlZUszNeMXD+Mgv0Qux5Vkq2xStQ3bCuqe0zDaERbqyIZVwTriGXYSbGFnGA2IyHm2KH0p0tG5lZUAFA5VWHfup32Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735043357; c=relaxed/simple; bh=sl03qk5wmNGrYwSL8jjvJ+NBSErs41ttHRFZc7vUYRU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IxStntRr5nO5dO7i9N5AuKTKeZSakPjiHdjVF5U5Cnvpuq3/ldrqC8fiE8SBgQFWAKJBO/GSopmsIrcn0bR3GYLWtYYbAoTdXLTSRVvA6XtJ5quyxUippXC1rjndPVAV8gLfTFz4CdshRTrskpcIOBUiQC4B6npcRuSiK9eVMEA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=none smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 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 4YHZ1w1F4wz4f3jdG; Tue, 24 Dec 2024 20:28:52 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.252]) by mail.maildlp.com (Postfix) with ESMTP id D59251A018D; Tue, 24 Dec 2024 20:29:11 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP3 (Coremail) with SMTP id _Ch0CgDXs8AWqWpnruNnFQ--.3177S3; Tue, 24 Dec 2024 20:29:11 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, jack@suse.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/6] jbd2: remove unused h_jdata flag of handle Date: Wed, 25 Dec 2024 04:27:02 +0800 Message-Id: <20241224202707.1530558-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20241224202707.1530558-1-shikemeng@huaweicloud.com> References: <20241224202707.1530558-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _Ch0CgDXs8AWqWpnruNnFQ--.3177S3 X-Coremail-Antispam: 1UD129KBjvdXoW7Gw1UGFykJF1xXFWDZr15XFb_yoWftrX_Aw 4vyrs7WrWxXFnxXw1fKFnrAFsxGay8Jr1UuFnYqr4qkryUZay5Ww4xAFs8ZrW7uFs3Cr43 WF18WryxKrnI9jkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbf8YFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r18M28IrcIa0xkI8VCY1x0267AKxVWUXVWUCwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7 xvwVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28E F7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F4 0EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_ Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI4 8JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xv wVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjx v20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20E Y4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267 AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU0a0PDUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ Content-Type: text/plain; charset="utf-8" Flag h_jdata is not used, just remove it. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara Reviewed-by: Zhang Yi --- include/linux/jbd2.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 50f7ea8714bf..c7fdb2b1b9a6 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -459,7 +459,6 @@ struct jbd2_revoke_table_s; * @h_ref: Reference count on this handle. * @h_err: Field for caller's use to track errors through large fs operati= ons. * @h_sync: Flag for sync-on-close. - * @h_jdata: Flag to force data journaling. * @h_reserved: Flag for handle for reserved credits. * @h_aborted: Flag indicating fatal error on handle. * @h_type: For handle statistics. @@ -491,7 +490,6 @@ struct jbd2_journal_handle =20 /* Flags [no locking] */ unsigned int h_sync: 1; - unsigned int h_jdata: 1; unsigned int h_reserved: 1; unsigned int h_aborted: 1; unsigned int h_type: 8; --=20 2.30.0 From nobody Mon Feb 9 03:58:56 2026 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 28A4519D074; Tue, 24 Dec 2024 12:29:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735043357; cv=none; b=fXIqLLaNvyOhFmb25iInJGtJGRJss9lFwogrxX9Q8JMTL+pUcNNGONcuftO02XfOXEq9GIpdZ3PqPzOkq23LXz/voMz+/924n+WmnpRneLFkTdUtVqhpQ0dWx26qNuI4y3vhWIWMccLIHd7y30S2BuR/7NnONTqswBMbfNpXYnU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735043357; c=relaxed/simple; bh=atB4dRZMSOHVr7DLzVptGOngY5Ny58C1nKvtaWArVHU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=n+L2slgiXK+r5T5K56Qaveeqp7fTPi9/8i3dB9iftAsx1b5R3AwRKGo6BboXNDT5i6u+4Iro0MJGsfbQ+T5vSAlgX1l+PzUvaQtCwM+X2SAlrS/z7z1O0kYW/+CoOwRwuoZAR+pplnvxJ4f960Iqtq4AJ6Q8EuSF9yBgUsk4XxM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=none smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 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 4YHZ1w2x7tz4f3jcr; Tue, 24 Dec 2024 20:28:52 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.252]) by mail.maildlp.com (Postfix) with ESMTP id 1BBFF1A018D; Tue, 24 Dec 2024 20:29:12 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP3 (Coremail) with SMTP id _Ch0CgDXs8AWqWpnruNnFQ--.3177S4; Tue, 24 Dec 2024 20:29:12 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, jack@suse.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] jbd2: remove unused return value of jbd2_journal_cancel_revoke Date: Wed, 25 Dec 2024 04:27:03 +0800 Message-Id: <20241224202707.1530558-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20241224202707.1530558-1-shikemeng@huaweicloud.com> References: <20241224202707.1530558-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _Ch0CgDXs8AWqWpnruNnFQ--.3177S4 X-Coremail-Antispam: 1UD129KBjvJXoWxJr4Uur4xGrykZFW5uF4fuFg_yoW8urW8pF 98G34rurWvkFyjvF1DWa15JFW2qr97Ca42gFWq93s7Kw42gr93tr4UGr1jqFyYqFZFga15 Zr4UGwsYkw18K3JanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBjb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwI xGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480 Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7 IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k2 6cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxV AFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07j-BMNUUUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ Content-Type: text/plain; charset="utf-8" Remove unused return value of jbd2_journal_cancel_revoke. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara Reviewed-by: Zhang Yi --- fs/jbd2/revoke.c | 5 +---- include/linux/jbd2.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c index 4556e4689024..af0208ed3619 100644 --- a/fs/jbd2/revoke.c +++ b/fs/jbd2/revoke.c @@ -420,12 +420,11 @@ int jbd2_journal_revoke(handle_t *handle, unsigned lo= ng long blocknr, * do not trust the Revoked bit on buffers unless RevokeValid is also * set. */ -int jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh) +void jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh) { struct jbd2_revoke_record_s *record; journal_t *journal =3D handle->h_transaction->t_journal; int need_cancel; - int did_revoke =3D 0; /* akpm: debug */ struct buffer_head *bh =3D jh2bh(jh); =20 jbd2_debug(4, "journal_head %p, cancelling revoke\n", jh); @@ -450,7 +449,6 @@ int jbd2_journal_cancel_revoke(handle_t *handle, struct= journal_head *jh) list_del(&record->hash); spin_unlock(&journal->j_revoke_lock); kmem_cache_free(jbd2_revoke_record_cache, record); - did_revoke =3D 1; } } =20 @@ -473,7 +471,6 @@ int jbd2_journal_cancel_revoke(handle_t *handle, struct= journal_head *jh) __brelse(bh2); } } - return did_revoke; } =20 /* diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index c7fdb2b1b9a6..e2d1426d3e06 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -1635,7 +1635,7 @@ extern int __init jbd2_journal_init_revoke_table_cach= e(void); =20 extern void jbd2_journal_destroy_revoke(journal_t *); extern int jbd2_journal_revoke (handle_t *, unsigned long long, struct = buffer_head *); -extern int jbd2_journal_cancel_revoke(handle_t *, struct journal_head *= ); +extern void jbd2_journal_cancel_revoke(handle_t *, struct journal_head = *); extern void jbd2_journal_write_revoke_records(transaction_t *transactio= n, struct list_head *log_bufs); =20 --=20 2.30.0 From nobody Mon Feb 9 03:58:56 2026 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 35A5D1B85FD; Tue, 24 Dec 2024 12:29:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735043357; cv=none; b=bwOb33tDfuFFM1/qGVKi60decPep08l7r+CvI8C9y2iEZvolkKX4Bp1f4L3lZAeWnCnCRGlui1XSCGiv66fwKmAUkr2Jgq9zG/86UrduYTY6lrajXRjz7XE84fRCbt69VpQjbC0jydIbhCaaM1356LBosAiXtzxBqWa9sskl2qQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735043357; c=relaxed/simple; bh=Bj0X2QFcEtpYuTf8EIvOv+6sAYkgT645Blxjon+pv0E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WBrC79rg6qJhj11vKb78Cu6bkX+7PQbeGvYZJxHoDFHGbdjbxPkcPAWh2ozm+GClVz4Zuk455CzuPLMBtGhOwK34glLT1xTXG6I5mchoa8pDw2SWswiUhNI7jgoCXIC2mK5VbV6x2X5weMM1THE5fcFEl65P7DMHw6K0vV3KmT8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4YHZ1v47fBz4f3lWF; Tue, 24 Dec 2024 20:28:51 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.252]) by mail.maildlp.com (Postfix) with ESMTP id 570B01A018D; Tue, 24 Dec 2024 20:29:12 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP3 (Coremail) with SMTP id _Ch0CgDXs8AWqWpnruNnFQ--.3177S5; Tue, 24 Dec 2024 20:29:12 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, jack@suse.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/6] jbd2: remove unused return value of do_readahead Date: Wed, 25 Dec 2024 04:27:04 +0800 Message-Id: <20241224202707.1530558-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20241224202707.1530558-1-shikemeng@huaweicloud.com> References: <20241224202707.1530558-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _Ch0CgDXs8AWqWpnruNnFQ--.3177S5 X-Coremail-Antispam: 1UD129KBjvJXoW7uw1UWFW5WrWxCrWxCry3Arb_yoW8Xw13pr n8Ka90kFZ0yr1jva4kJFs8tFWIgF47tFyUCrWqkwn5tF45JFsIqa4vgF1UtFyUtF95ua18 Zr1vv3srGw4jk3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBjb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwI xGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480 Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7 IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k2 6cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxV AFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jy0PhUUUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ Content-Type: text/plain; charset="utf-8" Remove unused return value of do_readahead. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara Reviewed-by: Zhang Yi --- fs/jbd2/recovery.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c index 9192be7c19d8..a671f8ee7dd2 100644 --- a/fs/jbd2/recovery.c +++ b/fs/jbd2/recovery.c @@ -65,9 +65,8 @@ static void journal_brelse_array(struct buffer_head *b[],= int n) */ =20 #define MAXBUF 8 -static int do_readahead(journal_t *journal, unsigned int start) +static void do_readahead(journal_t *journal, unsigned int start) { - int err; unsigned int max, nbufs, next; unsigned long long blocknr; struct buffer_head *bh; @@ -85,7 +84,7 @@ static int do_readahead(journal_t *journal, unsigned int = start) nbufs =3D 0; =20 for (next =3D start; next < max; next++) { - err =3D jbd2_journal_bmap(journal, next, &blocknr); + int err =3D jbd2_journal_bmap(journal, next, &blocknr); =20 if (err) { printk(KERN_ERR "JBD2: bad block at offset %u\n", @@ -94,10 +93,8 @@ static int do_readahead(journal_t *journal, unsigned int= start) } =20 bh =3D __getblk(journal->j_dev, blocknr, journal->j_blocksize); - if (!bh) { - err =3D -ENOMEM; + if (!bh) goto failed; - } =20 if (!buffer_uptodate(bh) && !buffer_locked(bh)) { bufs[nbufs++] =3D bh; @@ -112,12 +109,10 @@ static int do_readahead(journal_t *journal, unsigned = int start) =20 if (nbufs) bh_readahead_batch(nbufs, bufs, 0); - err =3D 0; =20 failed: if (nbufs) journal_brelse_array(bufs, nbufs); - return err; } =20 #endif /* __KERNEL__ */ --=20 2.30.0 From nobody Mon Feb 9 03:58:56 2026 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 90D151B87F5; Tue, 24 Dec 2024 12:29:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735043357; cv=none; b=g381LA3baUKXxuvjndjg8fTY/lRHRFpV71J/Kh0l4zE1O1cwp1nlr+X3Y+PpZmUTYqnDoq05I3J25Qt6Rv7JzUKlZ0KEcK+zI1Ps48RuATd4A/lgdz3UDHH/zcVGxDh16l/qjIiWnLu50/t3vMOS36Mlk5KOXxjl17g4ruRPmnc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735043357; c=relaxed/simple; bh=x2gbgwG4mO7RRAp389DxcxYM8zppio1NYhZ5+gcVBF4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QStmwCZdZzYIjMpKDb4h6wfv5zRmGPBIE5GQ/rbYb3IP/6TF4kZhY1cd0OZ9RbWLeEftHY+TGWgzL3C1eS4k193ZzD7DGXBzQQWPvpcrouruT3CXowlOQL7PRGnWyMwQZtu0owPfINfOpZ8IOhC+hQQYXKI0Ne9eHX1zjBirGFY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4YHZ2208X1z4f3jt3; Tue, 24 Dec 2024 20:28:58 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.252]) by mail.maildlp.com (Postfix) with ESMTP id 9CE061A018D; Tue, 24 Dec 2024 20:29:12 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP3 (Coremail) with SMTP id _Ch0CgDXs8AWqWpnruNnFQ--.3177S6; Tue, 24 Dec 2024 20:29:12 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, jack@suse.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] jbd2: remove stale comment of update_t_max_wait Date: Wed, 25 Dec 2024 04:27:05 +0800 Message-Id: <20241224202707.1530558-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20241224202707.1530558-1-shikemeng@huaweicloud.com> References: <20241224202707.1530558-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _Ch0CgDXs8AWqWpnruNnFQ--.3177S6 X-Coremail-Antispam: 1UD129KBjvdXoW7XF4fZF13uF4kXr4xXF1fWFg_yoWfKFg_Xr 4xCrsxXwnIqr42y3yfCw1fWrn5Wr1UZr1DZ3Zaya1jkr1jyanrur4vvrn5Wwnxua9Igr1a qw4kX340grnIvjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbfAYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0D M28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc 02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAF wI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7V AKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCj r7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6x IIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAI w20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x 0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IUnr9NDUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ Content-Type: text/plain; charset="utf-8" Commit 2d44292058828 "jbd2: remove CONFIG_JBD2_DEBUG to update t_max_wait" removed jbd2_journal_enable_debug, just remove stale comment about jbd2_journal_enable_debug. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- fs/jbd2/transaction.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 66513c18ca29..e00b87635512 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -119,7 +119,6 @@ static void jbd2_get_transaction(journal_t *journal, * t_max_wait is carefully updated here with use of atomic compare exchang= e. * Note that there could be multiplre threads trying to do this simultaneo= usly * hence using cmpxchg to avoid any use of locks in this case. - * With this t_max_wait can be updated w/o enabling jbd2_journal_enable_de= bug. */ static inline void update_t_max_wait(transaction_t *transaction, unsigned long ts) --=20 2.30.0 From nobody Mon Feb 9 03:58:56 2026 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 90CB91B87CD; Tue, 24 Dec 2024 12:29:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735043358; cv=none; b=YcB8JudnXdIvpWgASvH2vrzmdT7oSHaDmohO+ePO2fdqjyqsHe22EuTLU+BDopQ+NHELUzai2iN9P++yXSldk1hE8FXHyoSOp4r9ILFtgcX07q+R5muHZqXdUrK9T4Lxx0OpFuJzDwmrjeusri3lVY94VOtdQeeei9rAuGjFoPI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735043358; c=relaxed/simple; bh=4NU4+a42K4/yEFEblXfTCu13CBN/9PLQ9TDxTpMrhWU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lHIKNQ5u7N1OdVaHjcNMq1iwvVIrFtQ0mlh7FYKE5DD91GfqzWP86U3AJ+7Du2yjzEbu8FbQyeNUDrzs8iQN0EJ9EIepGR1PpQAOlnu0bmUxUKJ2zbH+ut9eUY7lGlvYY8ug9yNN9g/iNygPIz4Pu92t4lbx+hmrfXowvh3tGP0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=none smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 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 4YHZ221m2Hz4f3jt5; Tue, 24 Dec 2024 20:28:58 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.252]) by mail.maildlp.com (Postfix) with ESMTP id D72D31A0196; Tue, 24 Dec 2024 20:29:12 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP3 (Coremail) with SMTP id _Ch0CgDXs8AWqWpnruNnFQ--.3177S7; Tue, 24 Dec 2024 20:29:12 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, jack@suse.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] jbd2: correct stale function name in comment Date: Wed, 25 Dec 2024 04:27:06 +0800 Message-Id: <20241224202707.1530558-6-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20241224202707.1530558-1-shikemeng@huaweicloud.com> References: <20241224202707.1530558-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _Ch0CgDXs8AWqWpnruNnFQ--.3177S7 X-Coremail-Antispam: 1UD129KBjvJXoW7Kr4DGF1DJr1xKr45try3twb_yoW8Zr4rpr 9YkFy5ZrZ8Z34jyF1xWay5GrW7Ka4kZ3yUWFWv93Z7Ka15J3sIqr48try2qrWDKFn7K3yU AFWUCws5G3y09FDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBFb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7Jw A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jyYLPUUUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ Content-Type: text/plain; charset="utf-8" Rename stale journal_clear_revoked_flag to jbd2_clear_buffer_revoked_flags. Rename stale journal_switch_revoke to jbd2_journal_switch_revoke_table. Rename stale __journal_file_buffer to __jbd2_journal_file_buffer. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara Reviewed-by: Zhang Yi --- fs/jbd2/revoke.c | 8 ++++---- fs/jbd2/transaction.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c index af0208ed3619..5b7350109c5a 100644 --- a/fs/jbd2/revoke.c +++ b/fs/jbd2/revoke.c @@ -474,7 +474,7 @@ void jbd2_journal_cancel_revoke(handle_t *handle, struc= t journal_head *jh) } =20 /* - * journal_clear_revoked_flag clears revoked flag of buffers in + * jbd2_clear_buffer_revoked_flags clears revoked flag of buffers in * revoke table to reflect there is no revoked buffers in the next * transaction which is going to be started. */ @@ -503,9 +503,9 @@ void jbd2_clear_buffer_revoked_flags(journal_t *journal) } } =20 -/* journal_switch_revoke table select j_revoke for next transaction - * we do not want to suspend any processing until all revokes are - * written -bzzz +/* jbd2_journal_switch_revoke_table table select j_revoke for next + * transaction we do not want to suspend any processing until all + * revokes are written -bzzz */ void jbd2_journal_switch_revoke_table(journal_t *journal) { diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index e00b87635512..908baf73b188 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -2191,7 +2191,7 @@ static int __dispose_buffer(struct journal_head *jh, = transaction_t *transaction) /* * We don't want to write the buffer anymore, clear the * bit so that we don't confuse checks in - * __journal_file_buffer + * __jbd2_journal_file_buffer */ clear_buffer_dirty(bh); __jbd2_journal_file_buffer(jh, transaction, BJ_Forget); --=20 2.30.0 From nobody Mon Feb 9 03:58:56 2026 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 5ED7B1BBBC8; Tue, 24 Dec 2024 12:29:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735043358; cv=none; b=c8q1BKEuX1eyaUFwyHSiSiQo+hmOt9nfqMFTSmnXEiiAWVhTiR54KEJfBRLmrysqEunJy+PvqfRlXIdqRK3OfjE4/cwaAxJaagJMIqY13k01bIViGkPcFTONokr4SPQ/FSBb7er+olKQKzqBKqIQZEzdHpzTLvcJzC+J0z15Fm4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735043358; c=relaxed/simple; bh=V3suCflyKNpnn5UY8YjAqq5JZdfOv21v4IbGxLXk0A4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=p3N0SDrRj4ebMC/qEJFj38M0dEAJFtYLFwEAqRayufBIahUtRlPfKwRkL5eFPucrzu26PMkNZbRP6LYs7Oxq40lr7PPH3AkaZ0vmolS1ke16wsdtnHxz7uAsYfWxkg3LKz9KVbFqpDHeGOp0A773vnkQ6psqGm3+RPfyFg/ERhA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=none smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 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 4YHZ1x3FtQz4f3jcr; Tue, 24 Dec 2024 20:28:53 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.252]) by mail.maildlp.com (Postfix) with ESMTP id 26EA61A0194; Tue, 24 Dec 2024 20:29:13 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP3 (Coremail) with SMTP id _Ch0CgDXs8AWqWpnruNnFQ--.3177S8; Tue, 24 Dec 2024 20:29:13 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, jack@suse.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/6] jbd2: Correct stale comment of release_buffer_page Date: Wed, 25 Dec 2024 04:27:07 +0800 Message-Id: <20241224202707.1530558-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20241224202707.1530558-1-shikemeng@huaweicloud.com> References: <20241224202707.1530558-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _Ch0CgDXs8AWqWpnruNnFQ--.3177S8 X-Coremail-Antispam: 1UD129KBjvdXoWruw13XF1fWr48try3KF1kGrg_yoWfZrc_Za s293Z7uw17AFsrA3WxKw15Z3yxK393Zrn7uF48ta429ryUt39Yg3WkJF98K3sxWF4jgr13 Zrn2yr48tryfCjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbfAYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0D M28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc 02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAF wI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7V AKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCj r7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6x IIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAI w20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x 0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU0TqcUUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ Content-Type: text/plain; charset="utf-8" Update stale lock info in comment of release_buffer_page. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara Reviewed-by: Zhang Yi --- fs/jbd2/commit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 9153ff3a08e7..d812d15f295e 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -57,8 +57,8 @@ static void journal_end_buffer_io_sync(struct buffer_head= *bh, int uptodate) * So here, we have a buffer which has just come off the forget list. Loo= k to * see if we can strip all buffers from the backing page. * - * Called under lock_journal(), and possibly under journal_datalist_lock. = The - * caller provided us with a ref against the buffer, and we drop that here. + * Called under j_list_lock. The caller provided us with a ref against the + * buffer, and we drop that here. */ static void release_buffer_page(struct buffer_head *bh) { --=20 2.30.0