From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Oct 2009 22:06:37 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs... 
X-Git-Tag: drm-fsl-dcu-for-next~19244
X-Git-Url: http://git.agner.ch/gitweb/?p=linux-drm-fsl-dcu.git;a=commitdiff_plain;h=dcbeb0bec5f2695c3ff53f174efb8e03c209f3f3

Merge branch 'master' of git://git./linux/kernel/git/mason/btrfs-unstable

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: always pin metadata in discard mode
  Btrfs: enable discard support
  Btrfs: add -o discard option
  Btrfs: properly wait log writers during log sync
  Btrfs: fix possible ENOSPC problems with truncate
  Btrfs: fix btrfs acl #ifdef checks
  Btrfs: streamline tree-log btree block writeout
  Btrfs: avoid tree log commit when there are no changes
  Btrfs: only write one super copy during fsync
---

dcbeb0bec5f2695c3ff53f174efb8e03c209f3f3
diff --cc fs/btrfs/extent-tree.c
index d0c4d584efad,c56f91639dc1..e238a0cdac67
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@@ -1571,11 -1571,8 +1571,9 @@@ static int remove_extent_backref(struc
  static void btrfs_issue_discard(struct block_device *bdev,
  				u64 start, u64 len)
  {
 -	blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL);
 +	blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL,
 +			     DISCARD_FL_BARRIER);
  }
- #endif
  
  static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
  				u64 num_bytes)