diff for duplicates of <20080520025112.GN15035@mit.edu> diff --git a/a/1.txt b/N1/1.txt index fb4cda4..72dbffa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -114,3 +114,24 @@ index 3041d75..3fe5be5 100644 - */ - if (ret == -EOPNOTSUPP && barrier_done) { - char b[BDEVNAME_SIZE]; +- +- printk(KERN_WARNING +- "JBD: barrier-based sync failed on %s - " +- "disabling barriers\n", +- bdevname(journal->j_dev, b)); +- spin_lock(&journal->j_state_lock); +- journal->j_flags &= ~JBD2_BARRIER; +- spin_unlock(&journal->j_state_lock); ++ if (!ret && journal->j_flags & JBD2_BARRIER) ++ ret = blkdev_issue_flush(bh->b_bdev, NULL); + +- /* And try again, without the barrier */ +- set_buffer_uptodate(bh); +- set_buffer_dirty(bh); +- ret = submit_bh(WRITE, bh); +- } + *cbh = bh; + return ret; + } +-- +1.5.4.1.144.gdfee-dirty diff --git a/a/content_digest b/N1/content_digest index b850ed3..43b1903 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -11,7 +11,9 @@ Andrew Morton <akpm@linux-foundation.org> Eric Sandeen <sandeen@redhat.com> linux-ext4@vger.kernel.org - " linu\0" + linux-kernel@vger.kernel.org + linux-fsdevel@vger.kernel.org + " jamie@shareable.org\0" "\00:1\0" "b\0" "On Mon, May 19, 2008 at 10:46:54AM -0400, Theodore Tso wrote:\n" @@ -129,6 +131,27 @@ "-\t * to remember if we sent a barrier request\n" "-\t */\n" "-\tif (ret == -EOPNOTSUPP && barrier_done) {\n" - "-\t\tchar b[BDEVNAME_SIZE];" + "-\t\tchar b[BDEVNAME_SIZE];\n" + "-\n" + "-\t\tprintk(KERN_WARNING\n" + "-\t\t\t\"JBD: barrier-based sync failed on %s - \"\n" + "-\t\t\t\"disabling barriers\\n\",\n" + "-\t\t\tbdevname(journal->j_dev, b));\n" + "-\t\tspin_lock(&journal->j_state_lock);\n" + "-\t\tjournal->j_flags &= ~JBD2_BARRIER;\n" + "-\t\tspin_unlock(&journal->j_state_lock);\n" + "+\tif (!ret && journal->j_flags & JBD2_BARRIER)\n" + "+\t\tret = blkdev_issue_flush(bh->b_bdev, NULL);\n" + " \n" + "-\t\t/* And try again, without the barrier */\n" + "-\t\tset_buffer_uptodate(bh);\n" + "-\t\tset_buffer_dirty(bh);\n" + "-\t\tret = submit_bh(WRITE, bh);\n" + "-\t}\n" + " \t*cbh = bh;\n" + " \treturn ret;\n" + " }\n" + "-- \n" + 1.5.4.1.144.gdfee-dirty -92b8a1edbc86f1786ea44151eab8392c730a5cb404caf1f73f549e213b076ec6 +ec7390b6d90286978373e6e71d32b4468d0e56a28f0efdf6c5f97d0d2ece58df
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.