projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'sh/dwarf-unwinder', 'sh/g3-prep' and 'sh/stable-updates'
[deliverable/linux.git]
/
block
/
blk-merge.c
diff --git
a/block/blk-merge.c
b/block/blk-merge.c
index b0de8574fdc84e40e1bdf87dea4eb1af98769bb4..99cb5cf1f447fa8759d73f06bf64fe4b20eec580 100644
(file)
--- a/
block/blk-merge.c
+++ b/
block/blk-merge.c
@@
-351,7
+351,7
@@
static void blk_account_io_merge(struct request *req)
part = disk_map_sector_rcu(req->rq_disk, blk_rq_pos(req));
part_round_stats(cpu, part);
- part_dec_in_flight(part);
+ part_dec_in_flight(part
, rq_data_dir(req)
);
part_stat_unlock();
}
This page took
0.023167 seconds
and
5
git commands to generate.