From 172a8ec1cca68fdbd149f07dadacd7049a262860 Mon Sep 17 00:00:00 2001 From: "Jose R. Santos" Date: Thu, 18 Oct 2007 23:39:23 -0700 Subject: [PATCH] --- yaml --- r: 71400 b: refs/heads/master c: 9ad163ae0df8a3adab6d521475142392e3efb7a6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext3/inode.c | 2 +- trunk/fs/jbd/recovery.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index da5ab1c3ac83..a6f56c5b724d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a266e75cf5a1efd20d084408a1b7f1a185496dd +refs/heads/master: 9ad163ae0df8a3adab6d521475142392e3efb7a6 diff --git a/trunk/fs/ext3/inode.c b/trunk/fs/ext3/inode.c index 3dec003b773e..9b162cd6c16c 100644 --- a/trunk/fs/ext3/inode.c +++ b/trunk/fs/ext3/inode.c @@ -2954,7 +2954,7 @@ int ext3_write_inode(struct inode *inode, int wait) return 0; if (ext3_journal_current_handle()) { - jbd_debug(0, "called recursively, non-PF_MEMALLOC!\n"); + jbd_debug(1, "called recursively, non-PF_MEMALLOC!\n"); dump_stack(); return -EIO; } diff --git a/trunk/fs/jbd/recovery.c b/trunk/fs/jbd/recovery.c index 2a5f4b833e35..c5d9694b6a2f 100644 --- a/trunk/fs/jbd/recovery.c +++ b/trunk/fs/jbd/recovery.c @@ -250,10 +250,10 @@ int journal_recover(journal_t *journal) if (!err) err = do_one_pass(journal, &info, PASS_REPLAY); - jbd_debug(0, "JBD: recovery, exit status %d, " + jbd_debug(1, "JBD: recovery, exit status %d, " "recovered transactions %u to %u\n", err, info.start_transaction, info.end_transaction); - jbd_debug(0, "JBD: Replayed %d and revoked %d/%d blocks\n", + jbd_debug(1, "JBD: 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 @@ -297,7 +297,7 @@ int journal_skip_recovery(journal_t *journal) #ifdef CONFIG_JBD_DEBUG int dropped = info.end_transaction - be32_to_cpu(sb->s_sequence); #endif - jbd_debug(0, + jbd_debug(1, "JBD: ignoring %d transaction%s from the journal.\n", dropped, (dropped == 1) ? "" : "s"); journal->j_transaction_sequence = ++info.end_transaction;