Unverified Commit f461f825 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15008 nvme-rdma: unquiesce admin_q before destroy it 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yu Kuai <yukuai3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CFYNHV4BXABPUBIAVGUG2AB5SK65JEXK/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBHLET 
 
Link:https://gitee.com/openeuler/kernel/pulls/15008

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents ba86cb63 4492da52

drivers/nvme/host/rdma.c

+1 −7
Original line number Diff line number Diff line
@@ -1083,13 +1083,7 @@ static int nvme_rdma_setup_ctrl(struct nvme_rdma_ctrl *ctrl, bool new) 
		nvme_rdma_free_io_queues(ctrl);

	}

destroy_admin:

	nvme_quiesce_admin_queue(&ctrl->ctrl);

	blk_sync_queue(ctrl->ctrl.admin_q);

	nvme_rdma_stop_queue(&ctrl->queues[0]);

	nvme_cancel_admin_tagset(&ctrl->ctrl);

	if (new)

		nvme_remove_admin_tag_set(&ctrl->ctrl);

	nvme_rdma_destroy_admin_queue(ctrl);

	nvme_rdma_teardown_admin_queue(ctrl, new);

	return ret;

}