git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
block
/
blk-merge.c
diff --git
a/block/blk-merge.c
b/block/blk-merge.c
index
74bc4a7
..
ea85e20
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();
}
}