Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / block / blk-merge.c

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 74bc4a768f32e0f01e5c43f100f8663eea34c3a4..ea85e20d5e9462be965f3f117bd7c3efcf51aa57 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -351,11 +351,12 @@ static void blk_account_io_merge(struct request *req)
                int cpu;
 
                cpu = part_stat_lock();
-               part = disk_map_sector_rcu(req->rq_disk, blk_rq_pos(req));
+               part = req->part;
 
                part_round_stats(cpu, part);
                part_dec_in_flight(part, rq_data_dir(req));
 
+               hd_struct_put(part);
                part_stat_unlock();
        }
 }