From: sagi@grimberg.me (Sagi Grimberg)
Subject: [PATCH 1/3] nvme: rename NVME_CTRL_RECONNECTING state to NVME_CTRL_CONNECTING
Date: Thu, 8 Feb 2018 18:19:32 +0200 [thread overview]
Message-ID: <c896305c-90d0-e4aa-d861-ea9ad0076161@grimberg.me> (raw)
In-Reply-To: <d8241724-ef3a-4946-4629-3598413ca836@grimberg.me>
On 02/08/2018 05:28 PM, Sagi Grimberg wrote:
>
>> diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
>> index 6c2fdfa..219c6a0 100644
>> --- a/drivers/nvme/host/rdma.c
>> +++ b/drivers/nvme/host/rdma.c
>> @@ -887,7 +887,7 @@ static void nvme_rdma_free_ctrl(struct nvme_ctrl
>> *nctrl)
>> ? static void nvme_rdma_reconnect_or_remove(struct nvme_rdma_ctrl *ctrl)
>> ? {
>> ????? /* If we are resetting/deleting then do nothing */
>> -??? if (ctrl->ctrl.state != NVME_CTRL_RECONNECTING) {
>> +??? if (ctrl->ctrl.state != NVME_CTRL_CONNECTING) {
>> ????????? WARN_ON_ONCE(ctrl->ctrl.state == NVME_CTRL_NEW ||
>> ????????????? ctrl->ctrl.state == NVME_CTRL_LIVE);
>> ????????? return;
>> @@ -978,7 +978,7 @@ static void nvme_rdma_error_recovery_work(struct
>> work_struct *work)
>> ? static void nvme_rdma_error_recovery(struct nvme_rdma_ctrl *ctrl)
>> ? {
>> -??? if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_RECONNECTING))
>> +??? if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_CONNECTING))
>> ????????? return;
>> ????? queue_work(nvme_wq, &ctrl->err_work);
>>
> What is this based on? It does not apply on nvme-4.16.
Max, I fixed it up locally in nvme-4.16-rc, please verify that its
correct and passes your local tests.
next prev parent reply other threads:[~2018-02-08 16:19 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-31 16:31 [PATCH v3 0/3] Fix host side state machine Max Gurtovoy
2018-01-31 16:31 ` [PATCH 1/3] nvme: rename NVME_CTRL_RECONNECTING state to NVME_CTRL_CONNECTING Max Gurtovoy
2018-01-31 17:10 ` James Smart
2018-02-08 15:28 ` Sagi Grimberg
2018-02-08 16:19 ` Sagi Grimberg [this message]
2018-02-13 10:19 ` Max Gurtovoy
2018-02-13 10:46 ` Sagi Grimberg
2018-02-13 18:01 ` Max Gurtovoy
2018-02-13 23:55 ` Max Gurtovoy
2018-02-14 13:40 ` Sagi Grimberg
2018-02-14 14:20 ` Max Gurtovoy
2018-02-15 18:09 ` Max Gurtovoy
2018-01-31 16:31 ` [PATCH 2/3] nvme-rdma: use NVME_CTRL_CONNECTING state to mark init process Max Gurtovoy
2018-01-31 17:10 ` James Smart
2018-01-31 16:31 ` [PATCH 3/3] nvme: delete NVME_CTRL_LIVE --> NVME_CTRL_CONNECTING transition Max Gurtovoy
2018-01-31 17:11 ` James Smart
2018-02-05 14:46 ` [PATCH v3 0/3] Fix host side state machine Sagi Grimberg
2018-02-06 15:01 ` Max Gurtovoy
2018-02-08 16:01 ` Keith Busch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c896305c-90d0-e4aa-d861-ea9ad0076161@grimberg.me \
--to=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox