Commit 75685071 authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o

jbd2: revise KERN_EMERG error messages

Some of KERN_EMERG printk messages do not really deserve this log
level and the one in log_wait_commit() is even rather useless (the
journal has been previously aborted and *that* is where we should have
been complaining). So make some messages just KERN_ERR and remove the
useless message.
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent f6c07cad
...@@ -702,7 +702,7 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid) ...@@ -702,7 +702,7 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid)
read_lock(&journal->j_state_lock); read_lock(&journal->j_state_lock);
#ifdef CONFIG_JBD2_DEBUG #ifdef CONFIG_JBD2_DEBUG
if (!tid_geq(journal->j_commit_request, tid)) { if (!tid_geq(journal->j_commit_request, tid)) {
printk(KERN_EMERG printk(KERN_ERR
"%s: error: j_commit_request=%d, tid=%d\n", "%s: error: j_commit_request=%d, tid=%d\n",
__func__, journal->j_commit_request, tid); __func__, journal->j_commit_request, tid);
} }
...@@ -718,10 +718,8 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid) ...@@ -718,10 +718,8 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid)
} }
read_unlock(&journal->j_state_lock); read_unlock(&journal->j_state_lock);
if (unlikely(is_journal_aborted(journal))) { if (unlikely(is_journal_aborted(journal)))
printk(KERN_EMERG "journal commit I/O error\n");
err = -EIO; err = -EIO;
}
return err; return err;
} }
...@@ -2645,7 +2643,7 @@ static void __exit journal_exit(void) ...@@ -2645,7 +2643,7 @@ static void __exit journal_exit(void)
#ifdef CONFIG_JBD2_DEBUG #ifdef CONFIG_JBD2_DEBUG
int n = atomic_read(&nr_journal_heads); int n = atomic_read(&nr_journal_heads);
if (n) if (n)
printk(KERN_EMERG "JBD2: leaked %d journal_heads!\n", n); printk(KERN_ERR "JBD2: leaked %d journal_heads!\n", n);
#endif #endif
jbd2_remove_jbd_stats_proc_entry(); jbd2_remove_jbd_stats_proc_entry();
jbd2_journal_destroy_caches(); jbd2_journal_destroy_caches();
......
...@@ -932,7 +932,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh, ...@@ -932,7 +932,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh,
jbd2_alloc(jh2bh(jh)->b_size, jbd2_alloc(jh2bh(jh)->b_size,
GFP_NOFS); GFP_NOFS);
if (!frozen_buffer) { if (!frozen_buffer) {
printk(KERN_EMERG printk(KERN_ERR
"%s: OOM for frozen_buffer\n", "%s: OOM for frozen_buffer\n",
__func__); __func__);
JBUFFER_TRACE(jh, "oom!"); JBUFFER_TRACE(jh, "oom!");
...@@ -1166,7 +1166,7 @@ int jbd2_journal_get_undo_access(handle_t *handle, struct buffer_head *bh) ...@@ -1166,7 +1166,7 @@ int jbd2_journal_get_undo_access(handle_t *handle, struct buffer_head *bh)
if (!jh->b_committed_data) { if (!jh->b_committed_data) {
committed_data = jbd2_alloc(jh2bh(jh)->b_size, GFP_NOFS); committed_data = jbd2_alloc(jh2bh(jh)->b_size, GFP_NOFS);
if (!committed_data) { if (!committed_data) {
printk(KERN_EMERG "%s: No memory for committed data\n", printk(KERN_ERR "%s: No memory for committed data\n",
__func__); __func__);
err = -ENOMEM; err = -ENOMEM;
goto out; goto out;
...@@ -1308,7 +1308,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) ...@@ -1308,7 +1308,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)
JBUFFER_TRACE(jh, "fastpath"); JBUFFER_TRACE(jh, "fastpath");
if (unlikely(jh->b_transaction != if (unlikely(jh->b_transaction !=
journal->j_running_transaction)) { journal->j_running_transaction)) {
printk(KERN_EMERG "JBD: %s: " printk(KERN_ERR "JBD: %s: "
"jh->b_transaction (%llu, %p, %u) != " "jh->b_transaction (%llu, %p, %u) != "
"journal->j_running_transaction (%p, %u)", "journal->j_running_transaction (%p, %u)",
journal->j_devname, journal->j_devname,
...@@ -1335,7 +1335,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) ...@@ -1335,7 +1335,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)
JBUFFER_TRACE(jh, "already on other transaction"); JBUFFER_TRACE(jh, "already on other transaction");
if (unlikely(jh->b_transaction != if (unlikely(jh->b_transaction !=
journal->j_committing_transaction)) { journal->j_committing_transaction)) {
printk(KERN_EMERG "JBD: %s: " printk(KERN_ERR "JBD: %s: "
"jh->b_transaction (%llu, %p, %u) != " "jh->b_transaction (%llu, %p, %u) != "
"journal->j_committing_transaction (%p, %u)", "journal->j_committing_transaction (%p, %u)",
journal->j_devname, journal->j_devname,
...@@ -1348,7 +1348,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) ...@@ -1348,7 +1348,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)
ret = -EINVAL; ret = -EINVAL;
} }
if (unlikely(jh->b_next_transaction != transaction)) { if (unlikely(jh->b_next_transaction != transaction)) {
printk(KERN_EMERG "JBD: %s: " printk(KERN_ERR "JBD: %s: "
"jh->b_next_transaction (%llu, %p, %u) != " "jh->b_next_transaction (%llu, %p, %u) != "
"transaction (%p, %u)", "transaction (%p, %u)",
journal->j_devname, journal->j_devname,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment