X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=block%2Fblk-merge.c;h=99cb5cf1f447fa8759d73f06bf64fe4b20eec580;hb=c7ebf0657b1f47d85aee8349ed6345d940d7232a;hp=b0de8574fdc84e40e1bdf87dea4eb1af98769bb4;hpb=da6c5c720c52cc717124f8f0830b710ea6a092fd;p=safe%2Fjmp%2Flinux-2.6

diff --git a/block/blk-merge.c b/block/blk-merge.c
index b0de857..99cb5cf 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();
 	}