]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
nvme-fc: set NVME_REQ_CANCELLED in nvme_fc_terminate_exchange()
authorHannes Reinecke <hare@suse.de>
Fri, 26 Feb 2021 07:17:27 +0000 (08:17 +0100)
committerChristoph Hellwig <hch@lst.de>
Thu, 11 Mar 2021 10:48:34 +0000 (11:48 +0100)
nvme_fc_terminate_exchange() is being called when exchanges are
being deleted, and as such we should be setting the NVME_REQ_CANCELLED
flag to have identical behaviour on all transports.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: James Smart <jsmart2021@gmail.com>
Reviewed-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/fc.c

index 20dadd86e9812157cc655cc3ee0ab9eee9f6d423..ef12a619daecbf724cd805bdbe2f4efe0cd11268 100644 (file)
@@ -2443,6 +2443,7 @@ nvme_fc_terminate_exchange(struct request *req, void *data, bool reserved)
        struct nvme_fc_ctrl *ctrl = to_fc_ctrl(nctrl);
        struct nvme_fc_fcp_op *op = blk_mq_rq_to_pdu(req);
 
+       op->nreq.flags |= NVME_REQ_CANCELLED;
        __nvme_fc_abort_op(ctrl, op);
        return true;
 }