aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorOr Gerlitz <ogerlitz@voltaire.com>2011-01-13 10:43:40 +0100
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-03-10 11:48:21 +0100
commit03567812d81dd87a810b2bd1e804f4001de03da5 (patch)
treefbed361cfc8bc6f816d85d5edca31b37a2044b5e /drivers/block
parent7961243b7bdd62d72b47eb2c0bee776c51a8a8e2 (diff)
downloadkernel_samsung_tuna-03567812d81dd87a810b2bd1e804f4001de03da5.zip
kernel_samsung_tuna-03567812d81dd87a810b2bd1e804f4001de03da5.tar.gz
kernel_samsung_tuna-03567812d81dd87a810b2bd1e804f4001de03da5.tar.bz2
drbd: drop code present under #ifdef which is relevant to 2.6.28 and below
Signed-off-by: Or Gerlitz <ogerlitz@voltaire.com> Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_req.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index c2cc28a..5c0c8be 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -1127,11 +1127,7 @@ int drbd_make_request(struct request_queue *q, struct bio *bio)
const int sps = 1 << HT_SHIFT; /* sectors per slot */
const int mask = sps - 1;
const sector_t first_sectors = sps - (sect & mask);
- bp = bio_split(bio,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
- bio_split_pool,
-#endif
- first_sectors);
+ bp = bio_split(bio, first_sectors);
/* we need to get a "reference count" (ap_bio_cnt)
* to avoid races with the disconnect/reconnect/suspend code.