diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-21 12:08:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-21 12:08:26 -0700 |
| commit | b74b991fb8b9d642b8fea20d6245c6e19125a305 (patch) | |
| tree | e64b80b2b9a3c37a0e5299aa48e687f2e08a1c92 /drivers/nvme/host/rdma.c | |
| parent | Merge tag 'io_uring-5.6-20200320' of git://git.kernel.dk/linux-block (diff) | |
| parent | Merge branch 'nvme-5.6-rc6' of git://git.infradead.org/nvme into block-5.6 (diff) | |
| download | linux-dev-b74b991fb8b9d642b8fea20d6245c6e19125a305.tar.xz linux-dev-b74b991fb8b9d642b8fea20d6245c6e19125a305.zip | |
Merge tag 'block-5.6-20200320' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Just two NVMe fabrics fixes that should go into 5.6"
* tag 'block-5.6-20200320' of git://git.kernel.dk/linux-block:
nvmet-tcp: set MSG_MORE only if we actually have more to send
nvme-rdma: Avoid double freeing of async event data
Diffstat (limited to 'drivers/nvme/host/rdma.c')
| -rw-r--r-- | drivers/nvme/host/rdma.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 3e85c5cacefd..0fe08c4dfd2f 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -850,9 +850,11 @@ out_free_tagset: if (new) blk_mq_free_tag_set(ctrl->ctrl.admin_tagset); out_free_async_qe: - nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe, - sizeof(struct nvme_command), DMA_TO_DEVICE); - ctrl->async_event_sqe.data = NULL; + if (ctrl->async_event_sqe.data) { + nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe, + sizeof(struct nvme_command), DMA_TO_DEVICE); + ctrl->async_event_sqe.data = NULL; + } out_free_queue: nvme_rdma_free_queue(&ctrl->queues[0]); return error; |