From 64189ee9dcb306ca518eb503950e46023d3d85fb Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Tue, 27 Jul 2010 11:56:08 -0400 Subject: [PATCH] --- yaml --- r: 206315 b: refs/heads/master c: cc937db74bd5fe75f4cfebbfc4a04c1da10f0695 h: refs/heads/master i: 206313: a9f3d7f7015f70f0e3be9cc4b2eb26f452f955fc 206311: bce91360d23f05a10b708c070c89383b382816b8 v: v3 --- [refs] | 2 +- trunk/fs/jbd2/commit.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f6f79405b456..2ebfeb669f00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3570639c8b5f2c6a5018a2649c2b7c276af76d7 +refs/heads/master: cc937db74bd5fe75f4cfebbfc4a04c1da10f0695 diff --git a/trunk/fs/jbd2/commit.c b/trunk/fs/jbd2/commit.c index 75716d3d2be0..af056810acb6 100644 --- a/trunk/fs/jbd2/commit.c +++ b/trunk/fs/jbd2/commit.c @@ -150,8 +150,8 @@ static int journal_submit_commit_record(journal_t *journal, */ if (ret == -EOPNOTSUPP && barrier_done) { printk(KERN_WARNING - "JBD: barrier-based sync failed on %s - " - "disabling barriers\n", journal->j_devname); + "JBD2: Disabling barriers on %s, " + "not supported by device\n", journal->j_devname); spin_lock(&journal->j_state_lock); journal->j_flags &= ~JBD2_BARRIER; spin_unlock(&journal->j_state_lock); @@ -180,8 +180,8 @@ static int journal_wait_on_commit_record(journal_t *journal, wait_on_buffer(bh); if (buffer_eopnotsupp(bh) && (journal->j_flags & JBD2_BARRIER)) { printk(KERN_WARNING - "JBD2: wait_on_commit_record: sync failed on %s - " - "disabling barriers\n", journal->j_devname); + "JBD2: %s: disabling barries on %s - not supported " + "by device\n", __func__, journal->j_devname); spin_lock(&journal->j_state_lock); journal->j_flags &= ~JBD2_BARRIER; spin_unlock(&journal->j_state_lock);