diff options
| author | James Smart | 2017-04-23 17:30:06 +0200 |
|---|---|---|
| committer | Christoph Hellwig | 2017-04-24 09:15:04 +0200 |
| commit | 458f280d716d3205214c8bb5d4271bd54e939a61 (patch) | |
| tree | 97bda137bc3810dec574a39ccc25e4358ff5d3e6 /drivers/nvme | |
| parent | lightnvm: pblk: fix erase counters on error fail (diff) | |
| download | kernel-qcow2-linux-458f280d716d3205214c8bb5d4271bd54e939a61.tar.gz kernel-qcow2-linux-458f280d716d3205214c8bb5d4271bd54e939a61.tar.xz kernel-qcow2-linux-458f280d716d3205214c8bb5d4271bd54e939a61.zip | |
nvme_fc: fix command id check
The code validates the command_id in the response to the original
sqe command. But prior code was using the rq->rqno as the sqe command
id. The core layer overwrites what the transport set there originally.
Use the actual sqe content.
Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/fc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 596b3a453b54..cccade5a18c2 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -1192,6 +1192,7 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) struct nvme_fc_ctrl *ctrl = op->ctrl; struct nvme_fc_queue *queue = op->queue; struct nvme_completion *cqe = &op->rsp_iu.cqe; + struct nvme_command *sqe = &op->cmd_iu.sqe; __le16 status = cpu_to_le16(NVME_SC_SUCCESS << 1); union nvme_result result; @@ -1274,7 +1275,7 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) be32_to_cpu(op->rsp_iu.xfrd_len) != freq->transferred_length || op->rsp_iu.status_code || - op->rqno != le16_to_cpu(cqe->command_id))) { + sqe->common.command_id != cqe->command_id)) { status = cpu_to_le16(NVME_SC_FC_TRANSPORT_ERROR << 1); goto done; } |