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 /drivers/scsi/csiostor | |
| parent | c7bb9ad1744ea14e61e5fff99ee5282709b0c9d9 (diff) | |
| download | linux-stable-9cf2bab6307659b940da65d16dcc8f82c69f3a97.tar.gz linux-stable-9cf2bab6307659b940da65d16dcc8f82c69f3a97.tar.bz2 linux-stable-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 'drivers/scsi/csiostor')
| -rw-r--r-- | drivers/scsi/csiostor/csio_scsi.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c index 8c15b7acb4b7..a95debbea0e4 100644 --- a/drivers/scsi/csiostor/csio_scsi.c +++ b/drivers/scsi/csiostor/csio_scsi.c @@ -1780,16 +1780,10 @@ csio_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmnd) int nsge = 0; int rv = SCSI_MLQUEUE_HOST_BUSY, nr; int retval; - int cpu; struct csio_scsi_qset *sqset; struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device)); - if (!blk_rq_cpu_valid(cmnd->request)) - cpu = smp_processor_id(); - else - cpu = cmnd->request->cpu; - - sqset = &hw->sqset[ln->portid][cpu]; + sqset = &hw->sqset[ln->portid][blk_mq_rq_cpu(cmnd->request)]; nr = fc_remote_port_chkready(rport); if (nr) { |