X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=block%2Fblk-merge.c;fp=block%2Fblk-merge.c;h=77b7c26df6b50fea7a38ba0825d91583f1c4031c;hb=8e775167d54e6521e7cdbc03ee7ec42a8c67b49a;hp=0a2fd8a48a38ba7e7a6fa496438330f042047cd1;hpb=4b37ba90f49d4157ac5628f8d730d3505f176724;p=net-next-2.6.git

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 0a2fd8a48a3..77b7c26df6b 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -351,7 +351,7 @@ static void blk_account_io_merge(struct request *req)
 		int cpu;
 
 		cpu = part_stat_lock();
-		part = req->part;
+		part = disk_map_sector_rcu(req->rq_disk, blk_rq_pos(req));
 
 		part_round_stats(cpu, part);
 		part_dec_in_flight(part, rq_data_dir(req));