2015-11-12 20:25:06

by Alexandru Moise

Subject: [PATCH] jbd2: redefine jbd2_get_transaction to jbd2_init_transaction

This patch follows the same logic of a 2012 patch to jbd
(prior to ext3 removal). Yuanhan Liu renamed the jbd
get_transaction() function to init_transaction(), as the function
was as an initialization function, as it is mostly in our case.

Also remove the return value as it is unused.

Signed-off-by: Alexandru Moise <[email protected]>
---
fs/jbd2/transaction.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index 89463ee..3fd597b 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -65,7 +65,7 @@ void jbd2_journal_free_transaction(transaction_t *transaction)
}

/*
- * jbd2_get_transaction: obtain a new transaction_t object.
+ * jbd2_init_transaction: obtain a new transaction_t object.
*
* Simply allocate and initialise a new transaction. Create it in
* RUNNING state and add it to the current journal (which should not
@@ -79,8 +79,8 @@ void jbd2_journal_free_transaction(transaction_t *transaction)
*
*/

-static transaction_t *
-jbd2_get_transaction(journal_t *journal, transaction_t *transaction)
+static void
+jbd2_init_transaction(journal_t *journal, transaction_t *transaction)
{
transaction->t_journal = journal;
transaction->t_state = T_RUNNING;
@@ -104,8 +104,6 @@ jbd2_get_transaction(journal_t *journal, transaction_t *transaction)
transaction->t_max_wait = 0;
transaction->t_start = jiffies;
transaction->t_requested = 0;
-
- return transaction;
}

/*
@@ -343,7 +341,7 @@ repeat:
write_lock(&journal->j_state_lock);
if (!journal->j_running_transaction &&
(handle->h_reserved || !journal->j_barrier_count)) {
- jbd2_get_transaction(journal, new_transaction);
+ jbd2_init_transaction(journal, new_transaction);
new_transaction = NULL;
}
write_unlock(&journal->j_state_lock);
--
2.6.2

2015-11-12 21:27:57

by Jan Kara

Subject: Re: [PATCH] jbd2: redefine jbd2_get_transaction to jbd2_init_transaction

On Thu 12-11-15 22:25:06, Alexandru Moise wrote:
> This patch follows the same logic of a 2012 patch to jbd
> (prior to ext3 removal). Yuanhan Liu renamed the jbd
> get_transaction() function to init_transaction(), as the function
> was as an initialization function, as it is mostly in our case.
>
> Also remove the return value as it is unused.
>
> Signed-off-by: Alexandru Moise <[email protected]>

This is a border-line of a pointless churn but the original name was poor
so OK. You can add:

Reviewed-by: Jan Kara <[email protected]>

Honza
> ---
> fs/jbd2/transaction.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
> index 89463ee..3fd597b 100644
> --- a/fs/jbd2/transaction.c
> +++ b/fs/jbd2/transaction.c
> @@ -65,7 +65,7 @@ void jbd2_journal_free_transaction(transaction_t *transaction)
> }
>
> /*
> - * jbd2_get_transaction: obtain a new transaction_t object.
> + * jbd2_init_transaction: obtain a new transaction_t object.
> *
> * Simply allocate and initialise a new transaction. Create it in
> * RUNNING state and add it to the current journal (which should not
> @@ -79,8 +79,8 @@ void jbd2_journal_free_transaction(transaction_t *transaction)
> *
> */
>
> -static transaction_t *
> -jbd2_get_transaction(journal_t *journal, transaction_t *transaction)
> +static void
> +jbd2_init_transaction(journal_t *journal, transaction_t *transaction)
> {
> transaction->t_journal = journal;
> transaction->t_state = T_RUNNING;
> @@ -104,8 +104,6 @@ jbd2_get_transaction(journal_t *journal, transaction_t *transaction)
> transaction->t_max_wait = 0;
> transaction->t_start = jiffies;
> transaction->t_requested = 0;
> -
> - return transaction;
> }
>
> /*
> @@ -343,7 +341,7 @@ repeat:
> write_lock(&journal->j_state_lock);
> if (!journal->j_running_transaction &&
> (handle->h_reserved || !journal->j_barrier_count)) {
> - jbd2_get_transaction(journal, new_transaction);
> + jbd2_init_transaction(journal, new_transaction);
> new_transaction = NULL;
> }
> write_unlock(&journal->j_state_lock);
> --
> 2.6.2
>
>
--
Jan Kara <[email protected]>
SUSE Labs, CR