diff options
-rw-r--r-- | fs/jbd/journal.c | 8 | ||||
-rw-r--r-- | fs/jbd/transaction.c | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 2d04f9afafd7..06fe11e0abfa 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c | |||
@@ -573,7 +573,7 @@ int log_wait_commit(journal_t *journal, tid_t tid) | |||
573 | #ifdef CONFIG_JBD_DEBUG | 573 | #ifdef CONFIG_JBD_DEBUG |
574 | spin_lock(&journal->j_state_lock); | 574 | spin_lock(&journal->j_state_lock); |
575 | if (!tid_geq(journal->j_commit_request, tid)) { | 575 | if (!tid_geq(journal->j_commit_request, tid)) { |
576 | printk(KERN_EMERG | 576 | printk(KERN_ERR |
577 | "%s: error: j_commit_request=%d, tid=%d\n", | 577 | "%s: error: j_commit_request=%d, tid=%d\n", |
578 | __func__, journal->j_commit_request, tid); | 578 | __func__, journal->j_commit_request, tid); |
579 | } | 579 | } |
@@ -604,10 +604,8 @@ int log_wait_commit(journal_t *journal, tid_t tid) | |||
604 | out_unlock: | 604 | out_unlock: |
605 | spin_unlock(&journal->j_state_lock); | 605 | spin_unlock(&journal->j_state_lock); |
606 | 606 | ||
607 | if (unlikely(is_journal_aborted(journal))) { | 607 | if (unlikely(is_journal_aborted(journal))) |
608 | printk(KERN_EMERG "journal commit I/O error\n"); | ||
609 | err = -EIO; | 608 | err = -EIO; |
610 | } | ||
611 | return err; | 609 | return err; |
612 | } | 610 | } |
613 | 611 | ||
@@ -2136,7 +2134,7 @@ static void __exit journal_exit(void) | |||
2136 | #ifdef CONFIG_JBD_DEBUG | 2134 | #ifdef CONFIG_JBD_DEBUG |
2137 | int n = atomic_read(&nr_journal_heads); | 2135 | int n = atomic_read(&nr_journal_heads); |
2138 | if (n) | 2136 | if (n) |
2139 | printk(KERN_EMERG "JBD: leaked %d journal_heads!\n", n); | 2137 | printk(KERN_ERR "JBD: leaked %d journal_heads!\n", n); |
2140 | #endif | 2138 | #endif |
2141 | jbd_remove_debugfs_entry(); | 2139 | jbd_remove_debugfs_entry(); |
2142 | journal_destroy_caches(); | 2140 | journal_destroy_caches(); |
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index aa603e017d22..1695ba8334a2 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
@@ -675,7 +675,7 @@ repeat: | |||
675 | jbd_alloc(jh2bh(jh)->b_size, | 675 | jbd_alloc(jh2bh(jh)->b_size, |
676 | GFP_NOFS); | 676 | GFP_NOFS); |
677 | if (!frozen_buffer) { | 677 | if (!frozen_buffer) { |
678 | printk(KERN_EMERG | 678 | printk(KERN_ERR |
679 | "%s: OOM for frozen_buffer\n", | 679 | "%s: OOM for frozen_buffer\n", |
680 | __func__); | 680 | __func__); |
681 | JBUFFER_TRACE(jh, "oom!"); | 681 | JBUFFER_TRACE(jh, "oom!"); |
@@ -898,7 +898,7 @@ repeat: | |||
898 | if (!jh->b_committed_data) { | 898 | if (!jh->b_committed_data) { |
899 | committed_data = jbd_alloc(jh2bh(jh)->b_size, GFP_NOFS); | 899 | committed_data = jbd_alloc(jh2bh(jh)->b_size, GFP_NOFS); |
900 | if (!committed_data) { | 900 | if (!committed_data) { |
901 | printk(KERN_EMERG "%s: No memory for committed data\n", | 901 | printk(KERN_ERR "%s: No memory for committed data\n", |
902 | __func__); | 902 | __func__); |
903 | err = -ENOMEM; | 903 | err = -ENOMEM; |
904 | goto out; | 904 | goto out; |