summaryrefslogtreecommitdiff
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-10-25 00:06:02 +0400
committerJens Axboe <jaxboe@fusionio.com>2010-10-25 00:06:02 +0400
commitf253b86b4ad1b3220544e75880510fd455ebd23f (patch)
treecc2dd76b8ffc8df4356c1e95bd15276169dd335e /block/blk-merge.c
parent35da7a307c535f9c2929cae277f3df425c9f9b1e (diff)
downloadlinux-f253b86b4ad1b3220544e75880510fd455ebd23f.tar.xz
Revert "block: fix accounting bug on cross partition merges"
This reverts commit 7681bfeeccff5efa9eb29bf09249a3c400b15327. Conflicts: include/linux/genhd.h It has numerous issues with the cleanup path and non-elevator devices. Revert it for now so we can come up with a clean version without rushing things. Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block/blk-merge.c')
-rw-r--r--block/blk-merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c
index 0a2fd8a48a38..77b7c26df6b5 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));