diff --git a/[refs] b/[refs] index cd0a2abb7e81..8f66d5f6b8e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae00b267f3827ba88309fb74bdf7527396f0acf9 +refs/heads/master: 9a4f6271b68b9693290963b97b320d2e6e6f3446 diff --git a/trunk/fs/jbd2/recovery.c b/trunk/fs/jbd2/recovery.c index 2bc4d5f116f1..1cad869494f0 100644 --- a/trunk/fs/jbd2/recovery.c +++ b/trunk/fs/jbd2/recovery.c @@ -299,10 +299,10 @@ 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); -#endif jbd_debug(1, "JBD: ignoring %d transaction%s from the journal.\n", dropped, (dropped == 1) ? "" : "s"); +#endif journal->j_transaction_sequence = ++info.end_transaction; }