Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 301d4c9a authored by Jan Kara's avatar Jan Kara
Browse files

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.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent df4e7ac0

fs/jbd/journal.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -573,7 +573,7 @@ int log_wait_commit(journal_t *journal, tid_t tid) 
#ifdef CONFIG_JBD_DEBUG

#ifdef CONFIG_JBD_DEBUG

	spin_lock(&journal->j_state_lock);

	spin_lock(&journal->j_state_lock);

	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);

	}

	}
@@ -604,10 +604,8 @@ int log_wait_commit(journal_t *journal, tid_t tid) 
out_unlock:

out_unlock:

	spin_unlock(&journal->j_state_lock);

	spin_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;

}

}
@@ -2136,7 +2134,7 @@ static void __exit journal_exit(void) 
#ifdef CONFIG_JBD_DEBUG

#ifdef CONFIG_JBD_DEBUG

	int n = atomic_read(&nr_journal_heads);

	int n = atomic_read(&nr_journal_heads);

	if (n)

	if (n)

		printk(KERN_EMERG "JBD: leaked %d journal_heads!\n", n);

		printk(KERN_ERR "JBD: leaked %d journal_heads!\n", n);

#endif

#endif

	jbd_remove_debugfs_entry();

	jbd_remove_debugfs_entry();

	journal_destroy_caches();

	journal_destroy_caches();

fs/jbd/transaction.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -675,7 +675,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh, 
					jbd_alloc(jh2bh(jh)->b_size,

					jbd_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!");
@@ -898,7 +898,7 @@ int journal_get_undo_access(handle_t *handle, struct buffer_head *bh) 
	if (!jh->b_committed_data) {

	if (!jh->b_committed_data) {

		committed_data = jbd_alloc(jh2bh(jh)->b_size, GFP_NOFS);

		committed_data = jbd_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;