diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-10-31 17:01:22 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-11-07 13:42:33 -0700 |
| commit | 9cf2bab6307659b940da65d16dcc8f82c69f3a97 (patch) | |
| tree | f740e7d0f2603456ea2863453513fb8c4ed08ef2 /block/blk-merge.c | |
| parent | c7bb9ad1744ea14e61e5fff99ee5282709b0c9d9 (diff) | |
| download | linux-9cf2bab6307659b940da65d16dcc8f82c69f3a97.tar.gz linux-9cf2bab6307659b940da65d16dcc8f82c69f3a97.tar.bz2 linux-9cf2bab6307659b940da65d16dcc8f82c69f3a97.zip | |
block: kill request ->cpu member
This was used for completion placement for the legacy path,
but for mq we have rq->mq_ctx->cpu for that. Add a helper
to get the request CPU assignment, as the mq_ctx type is
private to blk-mq.
Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index a399b2fa8bc8..91b2af332a84 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -806,8 +806,6 @@ static struct request *attempt_merge(struct request_queue *q, blk_account_io_merge(next); req->ioprio = ioprio_best(req->ioprio, next->ioprio); - if (blk_rq_cpu_valid(next)) - req->cpu = next->cpu; /* * ownership of bio passed from next to req, return 'next' for |