Skip to contentSkip to conversation

btrfs: enable discard support

PATCH In review Christoph Hellwig 2 participants 3 messages Oct 14, 2009 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 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.

fs/btrfs/extent-tree.c +0 -6
Index: linux-2.6/fs/btrfs/extent-tree.c
===================================================================
@@ -1568,19 +1568,16 @@ static int remove_extent_backref(struct 
 	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,
 			     DISCARD_FL_BARRIER);
 }
-#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;
@@ -1604,9 +1601,6 @@ static int btrfs_discard_extent(struct b
 	}
 
 	return ret;
-#else
-	return 0;
-#endif
 }
 
 int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
#1 lore raw
Quoted 3 lines · Christoph Hellwig

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.

Thanks Christoph,

Any objection to me reordering these? That way someone bisecting around won't hit discard support without expecting it.

-chris

#2 lore raw
Quoted 9 lines · Chris Mason
Quoted 3 lines · Christoph Hellwig

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.

Thanks Christoph,

Any objection to me reordering these? That way someone bisecting around won't hit discard support without expecting it.

I'm perfectly fine with reordering them.