X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=block%2Fdeadline-iosched.c;h=b547cbca7b23a55dd9d1f0b444bed07d297fc646;hb=b2e75eff5e859d0c294e7405958362b26a423c6e;hp=c4d991d4adef0e7fd6e0d432941b88771d7c6530;hpb=b374d18a4bfce705e4a99ae9f501b53e86ecb283;p=safe%2Fjmp%2Flinux-2.6

diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c
index c4d991d..b547cbc 100644
--- a/block/deadline-iosched.c
+++ b/block/deadline-iosched.c
@@ -138,7 +138,7 @@ deadline_merge(struct request_queue *q, struct request **req, struct bio *bio)
 
 		__rq = elv_rb_find(&dd->sort_list[bio_data_dir(bio)], sector);
 		if (__rq) {
-			BUG_ON(sector != __rq->sector);
+			BUG_ON(sector != blk_rq_pos(__rq));
 
 			if (elv_rq_merge_ok(__rq, bio)) {
 				ret = ELEVATOR_FRONT_MERGE;