From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795043771; b=gMUOqTliJv7TcPhFJhTEjB5RFrwx+G9dehpJjec4qlDEfsaRJRZoHY0ZbDE5hDBUFsKj bvCqws3weR2vZjcNqX8IYyeI2vkzsjxl56EXRoUUK49Mg1tnsLX1D8+8Hmm9lqxalaKwv 7jVNOgmAu4C0H/k9JWBymv0Q5KaKS3rpdD6AfzGzBM7ip3QUKULyUbPPdat+XcZYdJOoj NV4ajXd1KJXvzm89+p9uB7mVkPZawrM2iwcuwzS3Mj9I4xpzPTpqSK+AwLG/n4Z8XR5Z3 st8Zn33h1Y9pzuwSunDm/mqG28NCR1EzuvpUXEZcKkRV4G4xjZ2m2gX+O9PtxQnmkcQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795043771; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=L+DuZznsX+FmLgmYDWQrezwMVeUzFqQHQjnsFLzT9eg=; b=U58jcGkIIAzNTUF0+LiTpLeyOahUMNJojCqfqIM6oiNExPFiehXY0KWsC0yrpEX15e7w enKE6oyprVputqWwQfUT+CxlIznzikkcjOdZgZP6vWb8GH9uR/nS+O8L9FznEbddO5Cuo xWwVo3gUCpkl69hHhy+fR1SJYM1KYuWM1t4nREpo8mYQ8BTYhJoQpQnrYb+I1kXUv3oeG mWL6J9rY5takAsbDiEbYOIuDDI/yekA80odn9IJAjO7a6zOHxuK/0WcZN2bdS3Gmn6AcR RPEGCdMam5ncBoJWo2ZBE5mihL3o3RbZ1XAae5/2gId1JU4/Rw8gLva5qyd+f0hgC3g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=iJzVkev1; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 24F24606A32A; Wed, 18 Nov 2026 23:16:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=iJzVkev1 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B7971F000C4; Wed, 18 Nov 2026 23:16:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795043771; bh=L+DuZznsX+FmLgmYDWQrezwMVeUzFqQHQjnsFLzT9eg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iJzVkev1oRmlTNRcBk8XgTlwg6dstyW9TptQk7uBvrYRU0HaNPIOXH82WC9psEMPC KQuIT1Kl+3LBDuSAUvzJQa9QksHzk6uPwJV00KeI3+yFVJal2a8lKdwkw6206TGziV 1b/p0z42Lg2O0UoZ3eem5Q/a5xnrKq+KrR7p02yQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ye Bin , Jan Kara , Zhang Yi , Theodore Tso , Sasha Levin Subject: [PATCH 6.1 0330/2857] jbd2: use shrink_type type instead of bool type for __jbd2_journal_clean_checkpoint_list() Date: Wed, 18 Nov 2026 15:22:44 +0100 Message-ID: <20261118150213.322155387@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150201.293410965@linuxfoundation.org> References: <20261118150201.293410965@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ye Bin [ Upstream commit 078760d950016f5982751f5512e69f26ad8feb31 ] "enum shrink_type" can clearly express the meaning of the parameter of __jbd2_journal_clean_checkpoint_list(), and there is no need to use the bool type. Signed-off-by: Ye Bin Reviewed-by: Jan Kara Reviewed-by: Zhang Yi Link: https://lore.kernel.org/r/20240407065355.1528580-2-yebin10@huawei.com Signed-off-by: Theodore Ts'o Stable-dep-of: f213e12ff5c9 ("jbd2: check need_resched() when skipping busy checkpoint buffers") Signed-off-by: Sasha Levin --- fs/jbd2/checkpoint.c | 16 +++++++++------- fs/jbd2/commit.c | 2 +- include/linux/jbd2.h | 4 +++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c index 10ce0b6b4ffa2..9fcc68884e262 100644 --- a/fs/jbd2/checkpoint.c +++ b/fs/jbd2/checkpoint.c @@ -367,8 +367,6 @@ int jbd2_cleanup_journal_tail(journal_t *journal) /* Checkpoint list management */ -enum shrink_type {SHRINK_DESTROY, SHRINK_BUSY_STOP, SHRINK_BUSY_SKIP}; - /* * journal_shrink_one_cp_list * @@ -505,21 +503,25 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal, * journal_clean_checkpoint_list * * Find all the written-back checkpoint buffers in the journal and release them. - * If 'destroy' is set, release all buffers unconditionally. + * If 'type' is SHRINK_DESTROY, release all buffers unconditionally. If 'type' + * is SHRINK_BUSY_STOP, will stop release buffers if encounters a busy buffer. + * To avoid wasting CPU cycles scanning the buffer list in some cases, don't + * pass SHRINK_BUSY_SKIP 'type' for this function. * * Called with j_list_lock held. */ -void __jbd2_journal_clean_checkpoint_list(journal_t *journal, bool destroy) +void __jbd2_journal_clean_checkpoint_list(journal_t *journal, + enum shrink_type type) { transaction_t *transaction, *last_transaction, *next_transaction; - enum shrink_type type; bool released; + WARN_ON_ONCE(type == SHRINK_BUSY_SKIP); + transaction = journal->j_checkpoint_transactions; if (!transaction) return; - type = destroy ? SHRINK_DESTROY : SHRINK_BUSY_STOP; last_transaction = transaction->t_cpprev; next_transaction = transaction; do { @@ -560,7 +562,7 @@ void jbd2_journal_destroy_checkpoint(journal_t *journal) spin_unlock(&journal->j_list_lock); break; } - __jbd2_journal_clean_checkpoint_list(journal, true); + __jbd2_journal_clean_checkpoint_list(journal, SHRINK_DESTROY); spin_unlock(&journal->j_list_lock); cond_resched(); } diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 6d02dcad8ffd7..33113c01f6fc6 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -535,7 +535,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) * frees some memory */ spin_lock(&journal->j_list_lock); - __jbd2_journal_clean_checkpoint_list(journal, false); + __jbd2_journal_clean_checkpoint_list(journal, SHRINK_BUSY_STOP); spin_unlock(&journal->j_list_lock); jbd2_debug(3, "JBD2: commit phase 1\n"); diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 5bf7ada754d79..e3d371565da85 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -1443,7 +1443,9 @@ void jbd2_update_log_tail(journal_t *journal, tid_t tid, unsigned long block); extern void jbd2_journal_commit_transaction(journal_t *); /* Checkpoint list management */ -void __jbd2_journal_clean_checkpoint_list(journal_t *journal, bool destroy); +enum shrink_type {SHRINK_DESTROY, SHRINK_BUSY_STOP, SHRINK_BUSY_SKIP}; + +void __jbd2_journal_clean_checkpoint_list(journal_t *journal, enum shrink_type type); unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal, unsigned long *nr_to_scan); int __jbd2_journal_remove_checkpoint(struct journal_head *); int jbd2_journal_try_remove_checkpoint(struct journal_head *jh); -- 2.53.0