diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 07:45:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 07:45:10 -0700 |
| commit | 8e775167d54e6521e7cdbc03ee7ec42a8c67b49a (patch) | |
| tree | a49914306fb28505c6e21a456df8bdc40d6eac23 /block/blk-merge.c | |
| parent | 4b37ba90f49d4157ac5628f8d730d3505f176724 (diff) | |
| parent | f253b86b4ad1b3220544e75880510fd455ebd23f (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Revert "block: fix accounting bug on cross partition merges"
Diffstat (limited to 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 2 |
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)); |