From: Baokun Li Date: Thu, 6 Mar 2025 06:32:40 +0000 (+0800) Subject: jbd2: remove jbd2_journal_unfile_buffer() X-Git-Tag: v6.15-rc1~145^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=743717670a36b80dfd43896dac5074f8ba5f163f;p=thirdparty%2Fkernel%2Flinux.git jbd2: remove jbd2_journal_unfile_buffer() Since the function jbd2_journal_unfile_buffer() is no longer called anywhere after commit e5a120aeb57f ("jbd2: remove journal_head from descriptor buffers"), so let's remove it. Signed-off-by: Baokun Li Reviewed-by: Zhang Yi Reviewed-by: Jan Kara Link: https://patch.msgid.link/20250306063240.157884-1-libaokun@huaweicloud.com Signed-off-by: Theodore Ts'o --- diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 27dfdfda972d9..cbc4785462f53 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -2075,21 +2075,6 @@ static void __jbd2_journal_unfile_buffer(struct journal_head *jh) jh->b_transaction = NULL; } -void jbd2_journal_unfile_buffer(journal_t *journal, struct journal_head *jh) -{ - struct buffer_head *bh = jh2bh(jh); - - /* Get reference so that buffer cannot be freed before we unlock it */ - get_bh(bh); - spin_lock(&jh->b_state_lock); - spin_lock(&journal->j_list_lock); - __jbd2_journal_unfile_buffer(jh); - spin_unlock(&journal->j_list_lock); - spin_unlock(&jh->b_state_lock); - jbd2_journal_put_journal_head(jh); - __brelse(bh); -} - /** * jbd2_journal_try_to_free_buffers() - try to free page buffers. * @journal: journal for operation diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index c211de10e9c8a..023e8abdb99a7 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -1396,7 +1396,6 @@ JBD2_FEATURE_INCOMPAT_FUNCS(fast_commit, FAST_COMMIT) */ /* Filing buffers */ -extern void jbd2_journal_unfile_buffer(journal_t *, struct journal_head *); extern bool __jbd2_journal_refile_buffer(struct journal_head *); extern void jbd2_journal_refile_buffer(journal_t *, struct journal_head *); extern void __jbd2_journal_file_buffer(struct journal_head *, transaction_t *, int);