RISC-V: Canaan devicetree fixes

[linux-2.6-microblaze.git] / fs / jbd2 / recovery.c

diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c
index e699d6a..f548479 100644 (file)
--- a/fs/jbd2/recovery.c
+++ b/fs/jbd2/recovery.c
@@ -245,11 +245,11 @@ static int fc_do_one_pass(journal_t *journal,
                return 0;
 
        while (next_fc_block <= journal->j_fc_last) {
-               jbd_debug(3, "Fast commit replay: next block %ld\n",
+               jbd2_debug(3, "Fast commit replay: next block %ld\n",
                          next_fc_block);
                err = jread(&bh, journal, next_fc_block);
                if (err) {
-                       jbd_debug(3, "Fast commit replay: read error\n");
+                       jbd2_debug(3, "Fast commit replay: read error\n");
                        break;
                }
 
@@ -263,7 +263,7 @@ static int fc_do_one_pass(journal_t *journal,
        }
 
        if (err)
-               jbd_debug(3, "Fast commit replay failed, err = %d\n", err);
+               jbd2_debug(3, "Fast commit replay failed, err = %d\n", err);
 
        return err;
 }
@@ -297,7 +297,7 @@ int jbd2_journal_recover(journal_t *journal)
         */
 
        if (!sb->s_start) {
-               jbd_debug(1, "No recovery required, last transaction %d\n",
+               jbd2_debug(1, "No recovery required, last transaction %d\n",
                          be32_to_cpu(sb->s_sequence));
                journal->j_transaction_sequence = be32_to_cpu(sb->s_sequence) + 1;
                return 0;
@@ -309,10 +309,10 @@ int jbd2_journal_recover(journal_t *journal)
        if (!err)
                err = do_one_pass(journal, &info, PASS_REPLAY);
 
-       jbd_debug(1, "JBD2: recovery, exit status %d, "
+       jbd2_debug(1, "JBD2: recovery, exit status %d, "
                  "recovered transactions %u to %u\n",
                  err, info.start_transaction, info.end_transaction);
-       jbd_debug(1, "JBD2: Replayed %d and revoked %d/%d blocks\n",
+       jbd2_debug(1, "JBD2: Replayed %d and revoked %d/%d blocks\n",
                  info.nr_replays, info.nr_revoke_hits, info.nr_revokes);
 
        /* Restart the log at the next transaction ID, thus invalidating
@@ -362,7 +362,7 @@ int jbd2_journal_skip_recovery(journal_t *journal)
 #ifdef CONFIG_JBD2_DEBUG
                int dropped = info.end_transaction - 
                        be32_to_cpu(journal->j_superblock->s_sequence);
-               jbd_debug(1,
+               jbd2_debug(1,
                          "JBD2: ignoring %d transaction%s from the journal.\n",
                          dropped, (dropped == 1) ? "" : "s");
 #endif
@@ -484,7 +484,7 @@ static int do_one_pass(journal_t *journal,
        if (pass == PASS_SCAN)
                info->start_transaction = first_commit_ID;
 
-       jbd_debug(1, "Starting recovery pass %d\n", pass);
+       jbd2_debug(1, "Starting recovery pass %d\n", pass);
 
        /*
         * Now we walk through the log, transaction by transaction,
@@ -510,7 +510,7 @@ static int do_one_pass(journal_t *journal,
                        if (tid_geq(next_commit_ID, info->end_transaction))
                                break;
 
-               jbd_debug(2, "Scanning for sequence ID %u at %lu/%lu\n",
+               jbd2_debug(2, "Scanning for sequence ID %u at %lu/%lu\n",
                          next_commit_ID, next_log_block,
                          jbd2_has_feature_fast_commit(journal) ?
                          journal->j_fc_last : journal->j_last);
@@ -519,7 +519,7 @@ static int do_one_pass(journal_t *journal,
                 * either the next descriptor block or the final commit
                 * record. */
 
-               jbd_debug(3, "JBD2: checking block %ld\n", next_log_block);
+               jbd2_debug(3, "JBD2: checking block %ld\n", next_log_block);
                err = jread(&bh, journal, next_log_block);
                if (err)
                        goto failed;
@@ -542,7 +542,7 @@ static int do_one_pass(journal_t *journal,
 
                blocktype = be32_to_cpu(tmp->h_blocktype);
                sequence = be32_to_cpu(tmp->h_sequence);
-               jbd_debug(3, "Found magic %d, sequence %d\n",
+               jbd2_debug(3, "Found magic %d, sequence %d\n",
                          blocktype, sequence);
 
                if (sequence != next_commit_ID) {
@@ -575,7 +575,7 @@ static int do_one_pass(journal_t *journal,
                                        goto failed;
                                }
                                need_check_commit_time = true;
-                               jbd_debug(1,
+                               jbd2_debug(1,
                                        "invalid descriptor block found in %lu\n",
                                        next_log_block);
                        }
@@ -758,7 +758,7 @@ static int do_one_pass(journal_t *journal,
                                 * It likely does not belong to same journal,
                                 * just end this recovery with success.
                                 */
-                               jbd_debug(1, "JBD2: Invalid checksum ignored in transaction %u, likely stale data\n",
+                               jbd2_debug(1, "JBD2: Invalid checksum ignored in transaction %u, likely stale data\n",
                                          next_commit_ID);
                                brelse(bh);
                                goto done;
@@ -826,7 +826,7 @@ static int do_one_pass(journal_t *journal,
                        if (pass == PASS_SCAN &&
                            !jbd2_descriptor_block_csum_verify(journal,
                                                               bh->b_data)) {
-                               jbd_debug(1, "JBD2: invalid revoke block found in %lu\n",
+                               jbd2_debug(1, "JBD2: invalid revoke block found in %lu\n",
                                          next_log_block);
                                need_check_commit_time = true;
                        }
@@ -845,7 +845,7 @@ static int do_one_pass(journal_t *journal,
                        continue;
 
                default:
-                       jbd_debug(3, "Unrecognised magic %d, end of scan.\n",
+                       jbd2_debug(3, "Unrecognised magic %d, end of scan.\n",
                                  blocktype);
                        brelse(bh);
                        goto done;