From: Jens Axboe <jaxboe@fusionio.com>
Date: Sat, 23 Oct 2010 16:43:55 +0000 (+0200)
Subject: Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-2.6.37/drivers
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~19874^2~3^2~5
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=53c2eb24ff49abe1bfc45d067797f74b409690d8;p=mirror_ubuntu-artful-kernel.git

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

53c2eb24ff49abe1bfc45d067797f74b409690d8
diff --cc drivers/block/drbd/drbd_int.h
index 9bdcf4393c0a,0c527d281622..c68dc290d11f
--- a/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);
  	}
  }