Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-2.6.37/drivers

diff --cc drivers/block/drbd/drbd_int.h
index 9bdcf4393c0aa9525c9c7918355cb9b985809a73,0c527d2816221711e48ff6855b754735fed926d1..c68dc290d11fbab92a9197240e85d3e2f61812d0
--- 1/drivers/block/drbd/drbd_int.h
--- 2/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@@ -2406,12 -2402,13 +2402,12 @@@ static inline void drbd_md_flush(struc
  {
        int r;
  
-       if (test_bit(MD_NO_BARRIER, &mdev->flags))
+       if (test_bit(MD_NO_FUA, &mdev->flags))
                return;
  
 -      r = blkdev_issue_flush(mdev->ldev->md_bdev, GFP_KERNEL, NULL,
 -                      BLKDEV_IFL_WAIT);
 +      r = blkdev_issue_flush(mdev->ldev->md_bdev, GFP_KERNEL, NULL);
        if (r) {
-               set_bit(MD_NO_BARRIER, &mdev->flags);
+               set_bit(MD_NO_FUA, &mdev->flags);
                dev_err(DEV, "meta data flush failed with status %d, disabling md-flushes\n", r);
        }
  }

diff --cc drivers/block/drbd/drbd_main.c
Simple merge

diff --cc drivers/block/drbd/drbd_receiver.c
Simple merge