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>
This commit is contained in:
parent
e244a0aeb6
commit
0634857488
@ -1568,18 +1568,15 @@ static int remove_extent_backref(struct btrfs_trans_handle *trans,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef BIO_RW_DISCARD
|
|
||||||
static void btrfs_issue_discard(struct block_device *bdev,
|
static void btrfs_issue_discard(struct block_device *bdev,
|
||||||
u64 start, u64 len)
|
u64 start, u64 len)
|
||||||
{
|
{
|
||||||
blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL);
|
blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
|
static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
|
||||||
u64 num_bytes)
|
u64 num_bytes)
|
||||||
{
|
{
|
||||||
#ifdef BIO_RW_DISCARD
|
|
||||||
int ret;
|
int ret;
|
||||||
u64 map_length = num_bytes;
|
u64 map_length = num_bytes;
|
||||||
struct btrfs_multi_bio *multi = NULL;
|
struct btrfs_multi_bio *multi = NULL;
|
||||||
@ -1606,9 +1603,6 @@ static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
|
|||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
#else
|
|
||||||
return 0;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
|
int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
|
||||||
|
Loading…
Reference in New Issue
Block a user