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 <shikemeng@huaweicloud.com>
---
 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, struct journal_head *jh)
 }
 
 /*
- * 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)
 	}
 }
 
-/* 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);
-- 
2.30.0

On 2024/12/25 4:27, Kemeng Shi wrote:
> 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 <shikemeng@huaweicloud.com>

Looks good to me.

Reviewed-by: Zhang Yi <yi.zhang@huawei.com>

> ---
>  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, struct journal_head *jh)
>  }
>  
>  /*
> - * 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)
>  	}
>  }
>  
> -/* 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);

On Wed 25-12-24 04:27:06, Kemeng Shi wrote:
> 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 <shikemeng@huaweicloud.com>

Thanks! Feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  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, struct journal_head *jh)
>  }
>  
>  /*
> - * 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)
>  	}
>  }
>  
> -/* 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);
> -- 
> 2.30.0
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR