From: Keith Busch Date: Tue, 15 Feb 2022 15:03:08 +0000 (-0800) Subject: nvme: explicitly set non-error for directives X-Git-Tag: v5.18-rc1~195^2~16^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c3adf0de1db86cf354dcb1a2dd1184e5e63a50a;p=thirdparty%2Flinux.git nvme: explicitly set non-error for directives Stream directives is an optional feature. It is not an error if a controller doesn't support as many as the kernel can optionally use. Explicitly set the non-error return value on this condition with a comment explaining why. Note, the return value was already 0 in this condition, so the setting is redundant. This patch should just silence bots that falsely believe the condition contains an error omission. Signed-off-by: Keith Busch Reviewed-by: Chaitanya Kulkarni Signed-off-by: Christoph Hellwig --- diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 52a49ae5b6730..1ce579d583c06 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -809,6 +809,8 @@ static int nvme_configure_directives(struct nvme_ctrl *ctrl) if (ctrl->nssa < BLK_MAX_WRITE_HINTS - 1) { dev_info(ctrl->device, "too few streams (%u) available\n", ctrl->nssa); + /* this condition is not an error: streams are optional */ + ret = 0; goto out_disable_stream; }