From: Zhang Yi <yi.zhang@huawei.com>
To: <linux-ext4@vger.kernel.org>, <linux-fsdevel@vger.kernel.org>,
<jack@suse.cz>, <tytso@mit.edu>
Cc: <adilger.kernel@dilger.ca>, <david@fromorbit.com>,
<hch@infradead.org>, <yi.zhang@huawei.com>
Subject: [RFC PATCH v4 6/8] jbd2: simplify journal_clean_one_cp_list()
Date: Thu, 10 Jun 2021 19:24:38 +0800 [thread overview]
Message-ID: <20210610112440.3438139-7-yi.zhang@huawei.com> (raw)
In-Reply-To: <20210610112440.3438139-1-yi.zhang@huawei.com>
Now that __try_to_free_cp_buf() remove checkpointed buffer or transaction
when the buffer is not 'busy', which is only called by
journal_clean_one_cp_list(). This patch simplify this function by remove
__try_to_free_cp_buf() and invoke __cp_buffer_busy() directly.
Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
---
fs/jbd2/checkpoint.c | 30 ++++--------------------------
1 file changed, 4 insertions(+), 26 deletions(-)
diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
index 1abdae44a3d8..51d1eb2ffeb9 100644
--- a/fs/jbd2/checkpoint.c
+++ b/fs/jbd2/checkpoint.c
@@ -91,25 +91,6 @@ static inline bool __cp_buffer_busy(struct journal_head *jh)
return (jh->b_transaction || buffer_locked(bh) || buffer_dirty(bh));
}
-/*
- * Try to release a checkpointed buffer from its transaction.
- * Returns 1 if we released it and 2 if we also released the
- * whole transaction.
- *
- * Requires j_list_lock
- */
-static int __try_to_free_cp_buf(struct journal_head *jh)
-{
- int ret = 0;
- struct buffer_head *bh = jh2bh(jh);
-
- if (!jh->b_transaction && !buffer_locked(bh) && !buffer_dirty(bh)) {
- JBUFFER_TRACE(jh, "remove from checkpoint list");
- ret = __jbd2_journal_remove_checkpoint(jh) + 1;
- }
- return ret;
-}
-
/*
* __jbd2_log_wait_for_space: wait until there is space in the journal.
*
@@ -440,7 +421,6 @@ static int journal_clean_one_cp_list(struct journal_head *jh, bool destroy)
{
struct journal_head *last_jh;
struct journal_head *next_jh = jh;
- int ret;
if (!jh)
return 0;
@@ -449,13 +429,11 @@ static int journal_clean_one_cp_list(struct journal_head *jh, bool destroy)
do {
jh = next_jh;
next_jh = jh->b_cpnext;
- if (!destroy)
- ret = __try_to_free_cp_buf(jh);
- else
- ret = __jbd2_journal_remove_checkpoint(jh) + 1;
- if (!ret)
+
+ if (!destroy && __cp_buffer_busy(jh))
return 0;
- if (ret == 2)
+
+ if (__jbd2_journal_remove_checkpoint(jh))
return 1;
/*
* This function only frees up some memory
--
2.31.1
next prev parent reply other threads:[~2021-06-10 11:16 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 11:24 [RFC PATCH v4 0/8] ext4, jbd2: fix 3 issues about bdev_try_to_free_page() Zhang Yi
2021-06-10 11:24 ` [RFC PATCH v4 1/8] jbd2: remove the out label in __jbd2_journal_remove_checkpoint() Zhang Yi
2021-06-24 14:35 ` Theodore Ts'o
2021-06-10 11:24 ` [RFC PATCH v4 2/8] jbd2: ensure abort the journal if detect IO error when writing original buffer back Zhang Yi
2021-06-24 14:35 ` Theodore Ts'o
2021-06-10 11:24 ` [RFC PATCH v4 3/8] jbd2: don't abort the journal when freeing buffers Zhang Yi
2021-06-24 14:35 ` Theodore Ts'o
2021-06-10 11:24 ` [RFC PATCH v4 4/8] jbd2: remove redundant buffer io error checks Zhang Yi
2021-06-24 14:35 ` Theodore Ts'o
2021-06-10 11:24 ` [RFC PATCH v4 5/8] jbd2,ext4: add a shrinker to release checkpointed buffers Zhang Yi
2021-06-10 16:12 ` Jan Kara
2021-06-24 14:56 ` Theodore Ts'o
2021-06-10 11:24 ` Zhang Yi [this message]
2021-06-24 14:56 ` [RFC PATCH v4 6/8] jbd2: simplify journal_clean_one_cp_list() Theodore Ts'o
2021-06-10 11:24 ` [RFC PATCH v4 7/8] ext4: remove bdev_try_to_free_page() callback Zhang Yi
2021-06-24 14:56 ` Theodore Ts'o
2021-06-10 11:24 ` [RFC PATCH v4 8/8] fs: remove bdev_try_to_free_page callback Zhang Yi
2021-06-24 14:56 ` Theodore Ts'o
2021-06-17 9:48 ` [RFC PATCH v4 0/8] ext4, jbd2: fix 3 issues about bdev_try_to_free_page() Christoph Hellwig
2021-06-21 15:25 ` Christoph Hellwig
2021-06-22 8:24 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210610112440.3438139-7-yi.zhang@huawei.com \
--to=yi.zhang@huawei.com \
--cc=adilger.kernel@dilger.ca \
--cc=david@fromorbit.com \
--cc=hch@infradead.org \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).