diff options
| author | Sagi Grimberg <sagi@grimberg.me> | 2016-09-23 03:58:17 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-09-23 03:58:17 +0200 |
| commit | 3b4ac78610690bd83fb33762ef97e8b8a89285ae (patch) | |
| tree | 5b0c18a8f3a68bc4223b080460a8b2e600a40cc8 /drivers/nvme | |
| parent | blk-throttle: Extend slice if throttle group is not empty (diff) | |
| download | linux-3b4ac78610690bd83fb33762ef97e8b8a89285ae.tar.xz linux-3b4ac78610690bd83fb33762ef97e8b8a89285ae.zip | |
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: e89ca58f9c90 ("nvme-rdma: add DELETING queue flag")
Reported-by: Steve Wise <swise@opengridcomputing.com>
Tested-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/rdma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index c2c2c28e6eb5..fbdb2267e460 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -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; |