block: move stats from disk to part0

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

diff --git a/block/blk-merge.c b/block/blk-merge.c
index d926a24bf1fd8df3ef73aa46cbc50b67136adc96..c77196d55899729ec6ddceccc80ef44b69f24f42 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -390,17 +390,13 @@ static int attempt_merge(struct request_queue *q, struct request *req,
                struct hd_struct *part;
                int cpu;
 
-               cpu = disk_stat_lock();
+               cpu = part_stat_lock();
                part = disk_map_sector_rcu(req->rq_disk, req->sector);
 
-               disk_round_stats(cpu, req->rq_disk);
-               req->rq_disk->in_flight--;
-               if (part) {
-                       part_round_stats(cpu, part);
-                       part->in_flight--;
-               }
+               part_round_stats(cpu, part);
+               part_dec_in_flight(part);
 
-               disk_stat_unlock();
+               part_stat_unlock();
        }
 
        req->ioprio = ioprio_best(req->ioprio, next->ioprio);