diff options
| author | Jens Axboe | 2009-10-13 12:29:45 +0200 |
|---|---|---|
| committer | Jens Axboe | 2009-10-13 12:29:45 +0200 |
| commit | c30f33437c3f85ec48353a1ef811e148217a2aaf (patch) | |
| tree | d5a0ca1e8d091a30fece2e9aeed285225c026049 /block/blk-merge.c | |
| parent | drbd: needs __ratelimit() (diff) | |
| parent | cciss: Add cciss_allow_hpsa module parameter (diff) | |
| download | kernel-qcow2-linux-c30f33437c3f85ec48353a1ef811e148217a2aaf.tar.gz kernel-qcow2-linux-c30f33437c3f85ec48353a1ef811e148217a2aaf.tar.xz kernel-qcow2-linux-c30f33437c3f85ec48353a1ef811e148217a2aaf.zip | |
Merge branch 'for-linus' into for-2.6.33
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 b0de8574fdc8..99cb5cf1f447 100644 --- 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(); } |