block: misc updates

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

diff --git a/block/blk-merge.c b/block/blk-merge.c
index d81d91419ff561be9b06afd61fd419df27e2ba77..9b17da698d7ce6ff5c93caa5717586bf4e9c4428 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -387,8 +387,8 @@ static int attempt_merge(struct request_queue *q, struct request *req,
        elv_merge_requests(q, req, next);
 
        if (req->rq_disk) {
-               struct hd_struct *part
-                       = get_part(req->rq_disk, req->sector);
+               struct hd_struct *part =
+                       disk_map_sector(req->rq_disk, req->sector);
                disk_round_stats(req->rq_disk);
                req->rq_disk->in_flight--;
                if (part) {