jbd2: remove the out label in __jbd2_journal_remove_checkpoint()

The 'out' lable just return the 'ret' value and seems not required, so
remove this label and switch to return appropriate value immediately.
This patch also do some minor cleanup, no logical change.

Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20210610112440.3438139-2-yi.zhang@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
index 63b526d44886d0b84db30570a1e57ae1e121278f..bf5511d19ac563f0c6d48ce5e65004d05f95d6a1 100644 (file)
--- a/fs/jbd2/checkpoint.c
+++ b/fs/jbd2/checkpoint.c
@@ -564,13 +564,13 @@ int __jbd2_journal_remove_checkpoint(struct journal_head *jh)
        struct transaction_chp_stats_s *stats;
        transaction_t *transaction;
        journal_t *journal;
-       int ret = 0;
 
        JBUFFER_TRACE(jh, "entry");
 
-       if ((transaction = jh->b_cp_transaction) == NULL) {
+       transaction = jh->b_cp_transaction;
+       if (!transaction) {
                JBUFFER_TRACE(jh, "not on transaction");
-               goto out;
+               return 0;
        }
        journal = transaction->t_journal;
 
@@ -579,9 +579,9 @@ int __jbd2_journal_remove_checkpoint(struct journal_head *jh)
        jh->b_cp_transaction = NULL;
        jbd2_journal_put_journal_head(jh);
 
-       if (transaction->t_checkpoint_list != NULL ||
-           transaction->t_checkpoint_io_list != NULL)
-               goto out;
+       /* Is this transaction empty? */
+       if (transaction->t_checkpoint_list || transaction->t_checkpoint_io_list)
+               return 0;
 
        /*
         * There is one special case to worry about: if we have just pulled the
@@ -593,10 +593,12 @@ int __jbd2_journal_remove_checkpoint(struct journal_head *jh)
         * See the comment at the end of jbd2_journal_commit_transaction().
         */
        if (transaction->t_state != T_FINISHED)
-               goto out;
+               return 0;
 
-       /* OK, that was the last buffer for the transaction: we can now
-          safely remove this transaction from the log */
+       /*
+        * OK, that was the last buffer for the transaction, we can now
+        * safely remove this transaction from the log.
+        */
        stats = &transaction->t_chp_stats;
        if (stats->cs_chp_time)
                stats->cs_chp_time = jbd2_time_diff(stats->cs_chp_time,
@@ -606,9 +608,7 @@ int __jbd2_journal_remove_checkpoint(struct journal_head *jh)
 
        __jbd2_journal_drop_transaction(journal, transaction);
        jbd2_journal_free_transaction(transaction);
-       ret = 1;
-out:
-       return ret;
+       return 1;
 }
 
 /*