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

Commit cc937db7 authored by Eric Sandeen's avatar Eric Sandeen Committed by Theodore Ts'o
Browse files

jbd2: Make barrier messages less scary 



Saying things like "sync failed" when a device does
not support barriers makes users slightly more worried than
they need to be; rather than talking about sync failures,
let's just state the barrier-based facts.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent e3570639

fs/jbd2/commit.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -150,8 +150,8 @@ static int journal_submit_commit_record(journal_t *journal, 
	 */

	 */

	if (ret == -EOPNOTSUPP && barrier_done) {

	if (ret == -EOPNOTSUPP && barrier_done) {

		printk(KERN_WARNING

		printk(KERN_WARNING

		       "JBD: barrier-based sync failed on %s - "

		       "JBD2: Disabling barriers on %s, "

		       "disabling barriers\n", journal->j_devname);

		       "not supported by device\n", journal->j_devname);

		spin_lock(&journal->j_state_lock);

		spin_lock(&journal->j_state_lock);

		journal->j_flags &= ~JBD2_BARRIER;

		journal->j_flags &= ~JBD2_BARRIER;

		spin_unlock(&journal->j_state_lock);

		spin_unlock(&journal->j_state_lock);
@@ -180,8 +180,8 @@ retry: 
	wait_on_buffer(bh);

	wait_on_buffer(bh);

	if (buffer_eopnotsupp(bh) && (journal->j_flags & JBD2_BARRIER)) {

	if (buffer_eopnotsupp(bh) && (journal->j_flags & JBD2_BARRIER)) {

		printk(KERN_WARNING

		printk(KERN_WARNING

		       "JBD2: wait_on_commit_record: sync failed on %s - "

		       "JBD2: %s: disabling barries on %s - not supported "

		       "disabling barriers\n", journal->j_devname);

		       "by device\n", __func__, journal->j_devname);

		spin_lock(&journal->j_state_lock);

		spin_lock(&journal->j_state_lock);

		journal->j_flags &= ~JBD2_BARRIER;

		journal->j_flags &= ~JBD2_BARRIER;

		spin_unlock(&journal->j_state_lock);

		spin_unlock(&journal->j_state_lock);