Commit 84e4c204 authored by Wu Bo's avatar Wu Bo Committed by Christoph Hellwig
Browse files

nvme: disable streams when get stream params failed 



Disable streams again if getting the stream params fails.

Signed-off-by: default avatarWu Bo <wubo40@huawei.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 614fc1c0

drivers/nvme/host/core.c

+6 −3
Original line number Diff line number Diff line
@@ -552,19 +552,22 @@ static int nvme_configure_directives(struct nvme_ctrl *ctrl) 


	ret = nvme_get_stream_params(ctrl, &s, NVME_NSID_ALL);

	if (ret)

		return ret;

		goto out_disable_stream;



	ctrl->nssa = le16_to_cpu(s.nssa);

	if (ctrl->nssa < BLK_MAX_WRITE_HINTS - 1) {

		dev_info(ctrl->device, "too few streams (%u) available\n",

					ctrl->nssa);

		nvme_disable_streams(ctrl);

		return 0;

		goto out_disable_stream;

	}



	ctrl->nr_streams = min_t(unsigned, ctrl->nssa, BLK_MAX_WRITE_HINTS - 1);

	dev_info(ctrl->device, "Using %u streams\n", ctrl->nr_streams);

	return 0;



out_disable_stream:

	nvme_disable_streams(ctrl);

	return ret;

}



/*