aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/volumes.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2008-09-24 11:48:04 -0400
committerChris Mason <chris.mason@oracle.com>2008-09-25 15:41:59 -0400
commit2b1f55b0f0d0d1a66470ef4ea2696cd5dd741a12 (patch)
tree980019fac9b0891e682bc7d9a8c8a58284b467fc /fs/btrfs/volumes.c
parent9b49c9b9f93e148815f2544d0c91f43b6d72eea9 (diff)
Remove Btrfs compat code for older kernels
Btrfs had compatibility code for kernels back to 2.6.18. These have been removed, and will be maintained in a separate backport git tree from now on. Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/volumes.c')
-rw-r--r--fs/btrfs/volumes.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index b9e5c2d82dde..ddf89626498a 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2080,20 +2080,11 @@ int btrfs_unplug_page(struct btrfs_mapping_tree *map_tree,
2080} 2080}
2081 2081
2082 2082
2083#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,23)
2084static void end_bio_multi_stripe(struct bio *bio, int err) 2083static void end_bio_multi_stripe(struct bio *bio, int err)
2085#else
2086static int end_bio_multi_stripe(struct bio *bio,
2087 unsigned int bytes_done, int err)
2088#endif
2089{ 2084{
2090 struct btrfs_multi_bio *multi = bio->bi_private; 2085 struct btrfs_multi_bio *multi = bio->bi_private;
2091 int is_orig_bio = 0; 2086 int is_orig_bio = 0;
2092 2087
2093#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)
2094 if (bio->bi_size)
2095 return 1;
2096#endif
2097 if (err) 2088 if (err)
2098 atomic_inc(&multi->error); 2089 atomic_inc(&multi->error);
2099 2090
@@ -2122,17 +2113,10 @@ static int end_bio_multi_stripe(struct bio *bio,
2122 } 2113 }
2123 kfree(multi); 2114 kfree(multi);
2124 2115
2125#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)
2126 bio_endio(bio, bio->bi_size, err);
2127#else
2128 bio_endio(bio, err); 2116 bio_endio(bio, err);
2129#endif
2130 } else if (!is_orig_bio) { 2117 } else if (!is_orig_bio) {
2131 bio_put(bio); 2118 bio_put(bio);
2132 } 2119 }
2133#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)
2134 return 0;
2135#endif
2136} 2120}
2137 2121
2138struct async_sched { 2122struct async_sched {
@@ -2248,11 +2232,7 @@ int btrfs_map_bio(struct btrfs_root *root, int rw, struct bio *bio,
2248 } else { 2232 } else {
2249 bio->bi_bdev = root->fs_info->fs_devices->latest_bdev; 2233 bio->bi_bdev = root->fs_info->fs_devices->latest_bdev;
2250 bio->bi_sector = logical >> 9; 2234 bio->bi_sector = logical >> 9;
2251#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)
2252 bio_endio(bio, bio->bi_size, -EIO);
2253#else
2254 bio_endio(bio, -EIO); 2235 bio_endio(bio, -EIO);
2255#endif
2256 } 2236 }
2257 dev_nr++; 2237 dev_nr++;
2258 } 2238 }