From 5e478aed9ba6f28f72c9faf1ca28c9bab7b33183 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Wed, 14 Oct 2009 09:24:59 -0400
Subject: [PATCH] --- yaml --- r: 167591 b: refs/heads/master c:
 0634857488ec6e28fa22920cd0bee3c2ac07ccfd h: refs/heads/master i:   167589:
 f25751615ad15076ff7d2621f1c850caca8acff5   167587:
 c7cd307eddb5fd836dad5b49451082168fd318e7   167583:
 f0519defa575030c8b5f939293e997a36c87c43a v: v3

---
 [refs]                       | 2 +-
 trunk/fs/btrfs/extent-tree.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 9dc4c241349c..e805de5bc1a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e244a0aeb6a599c19a7c802cda6e2d67c847b154
+refs/heads/master: 0634857488ec6e28fa22920cd0bee3c2ac07ccfd
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index bf7782fc5939..d4a35283d99e 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -1568,18 +1568,15 @@ static int remove_extent_backref(struct btrfs_trans_handle *trans,
 	return ret;
 }
 
-#ifdef BIO_RW_DISCARD
 static void btrfs_issue_discard(struct block_device *bdev,
 				u64 start, u64 len)
 {
 	blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL);
 }
-#endif
 
 static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
 				u64 num_bytes)
 {
-#ifdef BIO_RW_DISCARD
 	int ret;
 	u64 map_length = num_bytes;
 	struct btrfs_multi_bio *multi = NULL;
@@ -1606,9 +1603,6 @@ static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
 	}
 
 	return ret;
-#else
-	return 0;
-#endif
 }
 
 int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,