diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-11-08 19:19:16 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-11-08 19:19:16 +0300 |
| commit | 37d9486874ec925fa298bcd7ba628a9b206e812f (patch) | |
| tree | 2ad0366edb4bc659da232ed1e541a57b20a7d98b /drivers/nvme/host/fc.c | |
| parent | 1b0a151c10a6d823f033023b9fdd9af72a89591b (diff) | |
| parent | 706add13676da7ad213b65e92b94af5efc8c4131 (diff) | |
| download | linux-37d9486874ec925fa298bcd7ba628a9b206e812f.tar.xz | |
Merge tag 'nvme-6.7-2023-11-8' of git://git.infradead.org/nvme into block-6.7
Pull NVMe fixes from Keith:
"nvme fixes for 6.7
- nvme keyring config compile fixes (Hannes and Arnd)
- fabrics keep alive fixes (Hannes)
- tcp authentication fixes (Mark)
- io_uring_cmd error handling fix (Anuj)
- stale firmware attribute fix (Daniel)
- tcp memory leak (Christophe)
- cytpo library usage simplification (Eric)"
* tag 'nvme-6.7-2023-11-8' of git://git.infradead.org/nvme:
nvme: keyring: fix conditional compilation
nvme: common: make keyring and auth separate modules
nvme: start keep-alive after admin queue setup
nvme-loop: always quiesce and cancel commands before destroying admin q
nvme-tcp: avoid open-coding nvme_tcp_teardown_admin_queue()
nvme-auth: always set valid seq_num in dhchap reply
nvme-auth: add flag for bi-directional auth
nvme-auth: auth success1 msg always includes resp
nvme: fix error-handling for io_uring nvme-passthrough
nvme: update firmware version after commit
nvme-tcp: Fix a memory leak
nvme-auth: use crypto_shash_tfm_digest()
Diffstat (limited to 'drivers/nvme/host/fc.c')
| -rw-r--r-- | drivers/nvme/host/fc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index a15b37750d6e..49c3e46eaa1e 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2530,6 +2530,12 @@ __nvme_fc_abort_outstanding_ios(struct nvme_fc_ctrl *ctrl, bool start_queues) * clean up the admin queue. Same thing as above. */ nvme_quiesce_admin_queue(&ctrl->ctrl); + + /* + * Open-coding nvme_cancel_admin_tagset() as fc + * is not using nvme_cancel_request(). + */ + nvme_stop_keep_alive(&ctrl->ctrl); blk_sync_queue(ctrl->ctrl.admin_q); blk_mq_tagset_busy_iter(&ctrl->admin_tag_set, nvme_fc_terminate_exchange, &ctrl->ctrl); |