Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / fs / gfs2 / log.c

diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index ac750bd31a6f311e8a3dfc859a257c6f85b2f79d..eb01f3575e102a0216a89d30b041e284e78a560d 100644 (file)
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -592,22 +592,13 @@ static void log_write_header(struct gfs2_sbd *sdp, u32 flags, int pull)
        lh->lh_hash = cpu_to_be32(hash);
 
        bh->b_end_io = end_buffer_write_sync;
-       if (test_bit(SDF_NOBARRIERS, &sdp->sd_flags))
-               goto skip_barrier;
        get_bh(bh);
-       submit_bh(WRITE_BARRIER | REQ_META, bh);
-       wait_on_buffer(bh);
-       if (buffer_eopnotsupp(bh)) {
-               clear_buffer_eopnotsupp(bh);
-               set_buffer_uptodate(bh);
-               fs_info(sdp, "barrier sync failed - disabling barriers\n");
-               set_bit(SDF_NOBARRIERS, &sdp->sd_flags);
-               lock_buffer(bh);
-skip_barrier:
-               get_bh(bh);
+       if (test_bit(SDF_NOBARRIERS, &sdp->sd_flags))
                submit_bh(WRITE_SYNC | REQ_META, bh);
-               wait_on_buffer(bh);
-       }
+       else
+               submit_bh(WRITE_FLUSH_FUA | REQ_META, bh);
+       wait_on_buffer(bh);
+
        if (!buffer_uptodate(bh))
                gfs2_io_error_bh(sdp, bh);
        brelse(bh);