From 94f7de28c3a7d4c3632c3014ecd64359a6968a68 Mon Sep 17 00:00:00 2001
From: Or Gerlitz <ogerlitz@voltaire.com>
Date: Thu, 13 Jan 2011 10:43:40 +0100
Subject: [PATCH] --- yaml --- r: 242915 b: refs/heads/master c:
 03567812d81dd87a810b2bd1e804f4001de03da5 h: refs/heads/master i:   242913:
 612c94049b96116d3fe7c96917e87032faa1b94c   242911:
 97c4eec4a347cea63a77f38bc39b8b4e26bcdbe4 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/block/drbd/drbd_req.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 47ccf253adfd..bf8226b64ff0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7961243b7bdd62d72b47eb2c0bee776c51a8a8e2
+refs/heads/master: 03567812d81dd87a810b2bd1e804f4001de03da5
diff --git a/trunk/drivers/block/drbd/drbd_req.c b/trunk/drivers/block/drbd/drbd_req.c
index c2cc28a55907..5c0c8be1bb0a 100644
--- a/trunk/drivers/block/drbd/drbd_req.c
+++ b/trunk/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.