---

yaml --- r: 242915 b: refs/heads/master c: 0356781 h: refs/heads/master i: 242913: 612c940 242911: 97c4eec v: v3
git-mirror · Mar 10, 2011 · 94f7de2 · 94f7de2
1 parent 81d765e
commit 94f7de2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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.