diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2008-08-26 10:25:02 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2008-10-09 08:56:09 +0200 |
| commit | ab780f1ece0dc8d5e8e8e85435acc5e4747ccda3 (patch) | |
| tree | 4085b6c929a44de229eb5ef13fa2079211ea5512 /block/blk-merge.c | |
| parent | c7c22e4d5c1fdebfac4dba76de7d0338c2b0d832 (diff) | |
| download | kernel-crypto-ab780f1ece0dc8d5e8e8e85435acc5e4747ccda3.tar.gz kernel-crypto-ab780f1ece0dc8d5e8e8e85435acc5e4747ccda3.tar.xz kernel-crypto-ab780f1ece0dc8d5e8e8e85435acc5e4747ccda3.zip | |
block: inherit CPU completion on bio->rq and rq->rq merges
Somewhat incomplete, as we do allow merges of requests and bios
that have different completion CPUs given. This is done on the
assumption that a larger IO is still more beneficial than CPU
locality.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index c77196d5589..908d3e11ac5 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -400,6 +400,8 @@ static int attempt_merge(struct request_queue *q, struct request *req, } req->ioprio = ioprio_best(req->ioprio, next->ioprio); + if (blk_rq_cpu_valid(next)) + req->cpu = next->cpu; __blk_put_request(q, next); return 1; |