Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b4ac786 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Jens Axboe
Browse files

nvme-rdma: only clear queue flags after successful connect 



Otherwise, nvme_rdma_stop_and_clear_queue() will incorrectly
try to stop/free rdma qps/cm_ids that are already freed.

Fixes: e89ca58f ("nvme-rdma: add DELETING queue flag")
Reported-by: default avatarSteve Wise <swise@opengridcomputing.com>
Tested-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 164c80ed

drivers/nvme/host/rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,6 @@ static int nvme_rdma_init_queue(struct nvme_rdma_ctrl *ctrl, 


	queue = &ctrl->queues[idx];

	queue->ctrl = ctrl;

	queue->flags = 0;

	init_completion(&queue->cm_done);



	if (idx > 0)
@@ -595,6 +594,7 @@ static int nvme_rdma_init_queue(struct nvme_rdma_ctrl *ctrl, 
		goto out_destroy_cm_id;

	}



	clear_bit(NVME_RDMA_Q_DELETING, &queue->flags);

	set_bit(NVME_RDMA_Q_CONNECTED, &queue->flags);



	return 0;