diff options
author | David S. Miller <davem@davemloft.net> | 2009-05-17 11:55:57 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-17 11:55:57 -0700 |
commit | 74392592bbf7e93ef383588e21aea0c1450d6f12 (patch) | |
tree | 086981f9ef51d57a34fbc5fde8095652877cf739 /block/blk-merge.c | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6 (diff) | |
parent | Fix caller information for warn_slowpath_null (diff) | |
download | linux-dev-74392592bbf7e93ef383588e21aea0c1450d6f12.tar.xz linux-dev-74392592bbf7e93ef383588e21aea0c1450d6f12.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'block/blk-merge.c')
-rw-r--r-- | block/blk-merge.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 63760ca3da0f..23d2a6fe34a3 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -402,7 +402,10 @@ static int attempt_merge(struct request_queue *q, struct request *req, elv_merge_requests(q, req, next); - blk_account_io_merge(req); + /* + * 'next' is going away, so update stats accordingly + */ + blk_account_io_merge(next); req->ioprio = ioprio_best(req->ioprio, next->ioprio); if (blk_rq_cpu_valid(next)) |