lkml.org 
[lkml]   [2010]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 33/41] jbd: replace barriers with explicit flush / FUA usage
    Date
    From: Christoph Hellwig <hch@infradead.org>

    Switch to the WRITE_FLUSH_FUA flag for journal commits and remove the
    EOPNOTSUPP detection for barriers.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Acked-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Tejun Heo <tj@kernel.org>
    ---
    fs/jbd/commit.c | 30 +++---------------------------
    1 files changed, 3 insertions(+), 27 deletions(-)

    diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
    index 95d8c11..484c5e5 100644
    --- a/fs/jbd/commit.c
    +++ b/fs/jbd/commit.c
    @@ -137,34 +137,10 @@ static int journal_write_commit_record(journal_t *journal,
    JBUFFER_TRACE(descriptor, "write commit block");
    set_buffer_dirty(bh);

    - if (journal->j_flags & JFS_BARRIER) {
    - ret = __sync_dirty_buffer(bh, WRITE_SYNC | WRITE_BARRIER);
    -
    - /*
    - * Is it possible for another commit to fail at roughly
    - * the same time as this one? If so, we don't want to
    - * trust the barrier flag in the super, but instead want
    - * to remember if we sent a barrier request
    - */
    - if (ret == -EOPNOTSUPP) {
    - 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 &= ~JFS_BARRIER;
    - spin_unlock(&journal->j_state_lock);
    -
    - /* And try again, without the barrier */
    - set_buffer_uptodate(bh);
    - set_buffer_dirty(bh);
    - ret = sync_dirty_buffer(bh);
    - }
    - } else {
    + if (journal->j_flags & JFS_BARRIER)
    + ret = __sync_dirty_buffer(bh, WRITE_SYNC | WRITE_FLUSH_FUA);
    + else
    ret = sync_dirty_buffer(bh);
    - }

    put_bh(bh); /* One for getblk() */
    journal_put_journal_head(descriptor);
    --
    1.7.1


    \
     
     \ /
      Last update: 2010-09-03 12:37    [W:0.028 / U:32.880 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site