aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2009-10-14 09:24:59 -0400
committerChris Mason <chris.mason@oracle.com>2009-10-14 10:32:49 -0400
commit0634857488ec6e28fa22920cd0bee3c2ac07ccfd (patch)
tree6cfa348aea76f39b658d3a36ab51807a4ac7bcf7
parente244a0aeb6a599c19a7c802cda6e2d67c847b154 (diff)
Btrfs: enable discard support
The discard support code in btrfs currently is guarded by ifdefs for BIO_RW_DISCARD, which is never defines as it's the name of an enum memeber. Just remove the useless ifdefs to actually enable the code. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Chris Mason <chris.mason@oracle.com>
-rw-r--r--fs/btrfs/extent-tree.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index bf7782fc5939..d4a35283d99e 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -1568,18 +1568,15 @@ static int remove_extent_backref(struct btrfs_trans_handle *trans,
1568 return ret; 1568 return ret;
1569} 1569}
1570 1570
1571#ifdef BIO_RW_DISCARD
1572static void btrfs_issue_discard(struct block_device *bdev, 1571static void btrfs_issue_discard(struct block_device *bdev,
1573 u64 start, u64 len) 1572 u64 start, u64 len)
1574{ 1573{
1575 blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL); 1574 blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL);
1576} 1575}
1577#endif
1578 1576
1579static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr, 1577static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
1580 u64 num_bytes) 1578 u64 num_bytes)
1581{ 1579{
1582#ifdef BIO_RW_DISCARD
1583 int ret; 1580 int ret;
1584 u64 map_length = num_bytes; 1581 u64 map_length = num_bytes;
1585 struct btrfs_multi_bio *multi = NULL; 1582 struct btrfs_multi_bio *multi = NULL;
@@ -1606,9 +1603,6 @@ static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
1606 } 1603 }
1607 1604
1608 return ret; 1605 return ret;
1609#else
1610 return 0;
1611#endif
1612} 1606}
1613 1607
1614int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, 1608int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,