Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH] nvme/core:disable streams when get stream params failed
To:     Christoph Hellwig <hch@lst.de>
CC:     <kbusch@kernel.org>, <axboe@fb.com>, <sagi@grimberg.me>,
        <linux-nvme@lists.infradead.org>, <linux-kernel@vger.kernel.org>,
        <liuzhiqiang26@huawei.com>, <linfeilong@huawei.com>
References: <1588754221-661597-1-git-send-email-wubo40@huawei.com>
 <20200512160618.GA5403@lst.de>
From:   Wu Bo <wubo40@huawei.com>
Message-ID: <cecc6494-efab-ef38-6461-e6d571cb05ee@huawei.com>
Date:   Wed, 13 May 2020 14:12:23 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101
 Thunderbird/68.6.0
MIME-Version: 1.0
In-Reply-To: <20200512160618.GA5403@lst.de>
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On 2020/5/13 0:06, Christoph Hellwig wrote:
> On Wed, May 06, 2020 at 04:37:01PM +0800, Wu Bo wrote:
>> After enable nvme streams, then if get stream params failed,
>> We should disable streams before return error in
>> nvme_configure_directives() function.
>>
>> Signed-off-by: Wu Bo <wubo40@huawei.com>
>> ---
>>   drivers/nvme/host/core.c | 4 +++-
>>   1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
>> index f2adea9..afe1f5a 100644
>> --- a/drivers/nvme/host/core.c
>> +++ b/drivers/nvme/host/core.c
>> @@ -552,8 +552,10 @@ static int nvme_configure_directives(struct nvme_ctrl *ctrl)
>>   		return ret;
>>   
>>   	ret = nvme_get_stream_params(ctrl, &s, NVME_NSID_ALL);
>> -	if (ret)
>> +	if (ret) {
>> +		nvme_disable_streams(ctrl);
>>   		return ret;
>> +	}
> 
> Please use a out_disable goto label to not duplicate the error
> handling with the other case that needs it.
> 

OK， I will modify it in the V2 patch.

Thanks,
Wu Bo

> .
>