block: replace bi_bdev with a gendisk pointer and partitions index

[linux-2.6-block.git] / block / blk-merge.c

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 05f116bfb99dac3763c61536573c49f72c1079d0..aa524cad5bea3a0d46232f6becbfe970947df39e 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -786,7 +786,7 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio)
                return false;
 
        /* must be same device and not a special request */
-       if (rq->rq_disk != bio->bi_bdev->bd_disk || req_no_special_merge(rq))
+       if (rq->rq_disk != bio->bi_disk || req_no_special_merge(rq))
                return false;
 
        /* only merge integrity protected bio into ditto rq */