jbd: Revise KERN_EMERG error messages
PATCH 1/1 jbd: 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.
--- fs/jbd/journal.c | 8 +++----- fs/jbd/transaction.c | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-)
I plan to add this patch to my tree unless someone objects.
Honza
fs/jbd/journal.c +3 -5
@@ -573,7 +573,7 @@ int log_wait_commit(journal_t *journal, tid_t tid)#ifdef CONFIG_JBD_DEBUG spin_lock (&journal->j_state_lock);if (!tid_geq (journal->j_commit_request, tid)) { -printk (KERN_EMERG +printk (KERN_ERR "%s: error: j_commit_request=%d, tid=%d\n" , __func__, journal->j_commit_request, tid); }
@@ -604,10 +604,8 @@ int log_wait_commit(journal_t *journal, tid_t tid) out_unlock:spin_unlock (&journal->j_state_lock); -if (unlikely (is_journal_aborted (journal))) { -printk (KERN_EMERG "journal commit I/O error\n" ); +if (unlikely (is_journal_aborted (journal))) err = -EIO ; - }return err; }
@@ -2136,7 +2134,7 @@ static void __exit journal_exit(void)#ifdef CONFIG_JBD_DEBUG int n =atomic_read (&nr_journal_heads);if (n) -printk (KERN_EMERG "JBD: leaked %d journal_heads!\n" , n); +printk (KERN_ERR "JBD: leaked %d journal_heads!\n" , n);#endif jbd_remove_debugfs_entry ();journal_destroy_caches ();
fs/jbd/transaction.c +2 -2
@@ -675,7 +675,7 @@ repeat:jbd_alloc (jh2bh (jh)->b_size,GFP_NOFS );if (!frozen_buffer) { -printk (KERN_EMERG +printk (KERN_ERR "%s: OOM for frozen_buffer\n" , __func__);JBUFFER_TRACE (jh,"oom!" );
@@ -898,7 +898,7 @@ repeat:if (!jh->b_committed_data) { committed_data =jbd_alloc (jh2bh (jh)->b_size,GFP_NOFS );if (!committed_data) { -printk (KERN_EMERG "%s: No memory for committed data\n" , +printk (KERN_ERR "%s: No memory for committed data\n" , __func__); err = -ENOMEM ; goto out;
Signature · 1 line
1.8.1.4
PATCH 1/1 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.
--- fs/jbd2/journal.c | 8 +++----- fs/jbd2/transaction.c | 10 +++++----- 2 files changed, 8 insertions(+), 10 deletions(-)
fs/jbd2/journal.c +3 -5
@@ -702,7 +702,7 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid)read_lock (&journal->j_state_lock);#ifdef CONFIG_JBD2_DEBUG if (!tid_geq (journal->j_commit_request, tid)) { -printk (KERN_EMERG +printk (KERN_ERR "%s: error: j_commit_request=%d, tid=%d\n" , __func__, journal->j_commit_request, tid); }
@@ -718,10 +718,8 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid) }read_unlock (&journal->j_state_lock); -if (unlikely (is_journal_aborted (journal))) { -printk (KERN_EMERG "journal commit I/O error\n" ); +if (unlikely (is_journal_aborted (journal))) err = -EIO ; - }return err; }
@@ -2645,7 +2643,7 @@ static void __exit journal_exit(void)#ifdef CONFIG_JBD2_DEBUG int n =atomic_read (&nr_journal_heads);if (n) -printk (KERN_EMERG "JBD2: leaked %d journal_heads!\n" , n); +printk (KERN_ERR "JBD2: leaked %d journal_heads!\n" , n);#endif jbd2_remove_jbd_stats_proc_entry ();jbd2_journal_destroy_caches ();
fs/jbd2/transaction.c +5 -5
@@ -932,7 +932,7 @@ repeat:jbd2_alloc (jh2bh (jh)->b_size,GFP_NOFS );if (!frozen_buffer) { -printk (KERN_EMERG +printk (KERN_ERR "%s: OOM for frozen_buffer\n" , __func__);JBUFFER_TRACE (jh,"oom!" );
@@ -1166,7 +1166,7 @@ repeat:if (!jh->b_committed_data) { committed_data =jbd2_alloc (jh2bh (jh)->b_size,GFP_NOFS );if (!committed_data) { -printk (KERN_EMERG "%s: No memory for committed data\n" , +printk (KERN_ERR "%s: No memory for committed data\n" , __func__); err = -ENOMEM ; goto out;
@@ -1305,7 +1305,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)JBUFFER_TRACE (jh,"fastpath" );if (unlikely (jh->b_transaction != journal->j_running_transaction)) { - printk(KERN_EMERG "JBD: %s: " + printk(KERN_ERR "JBD: %s: " "jh->b_transaction (%llu, %p, %u) != " "journal->j_running_transaction (%p, %u)", journal->j_devname,
@@ -1332,7 +1332,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)JBUFFER_TRACE (jh,"already on other transaction" );if (unlikely (jh->b_transaction != journal->j_committing_transaction)) { - printk(KERN_EMERG "JBD: %s: " + printk(KERN_ERR "JBD: %s: " "jh->b_transaction (%llu, %p, %u) != " "journal->j_committing_transaction (%p, %u)", journal->j_devname,
@@ -1345,7 +1345,7 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) ret = -EINVAL ; }if (unlikely (jh->b_next_transaction != transaction)) { - printk(KERN_EMERG "JBD: %s: " + printk(KERN_ERR "JBD: %s: " "jh->b_next_transaction (%llu, %p, %u) != " "transaction (%p, %u)", journal->j_devname,
Signature · 1 line
1.8.1.4
Re: [PATCH] jbd2: Revise KERN_EMERG error messages
Quoted 7 lines · Jan Kara
Some of
KERN_EMERGprintk messages do not really deserve this log level and the one inlog_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 justKERN_ERRand remove the useless message.Signed-off-by Jan Kara <[email protected]>
Thanks, applied.
- Ted