From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87058C6FD1F for ; Mon, 20 Mar 2023 01:03:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231422AbjCTBDt (ORCPT ); Sun, 19 Mar 2023 21:03:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231321AbjCTBCy (ORCPT ); Sun, 19 Mar 2023 21:02:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DB1123854; Sun, 19 Mar 2023 17:57:36 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2A6DF61204; Mon, 20 Mar 2023 00:57:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF47AC433EF; Mon, 20 Mar 2023 00:57:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679273840; bh=nD/p5Flp6LuUhsPojE0Dk0+s5ZY25hB+PXBH1ZDKZ4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bqwu1/aZyfwrO3/fD2j2r9HqGPdxWTp7gntPCeUWD+S7G34of9fdQEPMGUHSJcCr+ BZhyOD5psVv5fBZ4jcLEYhc/7xi1rEhlflN2sG9r1AJdP0ZEvlCkA4wBOVYpEw6a+H 5HxcHytGpd5ldRCQG2W7Y511nn+emzhg4S3cq4m+mKwelZMOehWS5MVQjRK2Bz43bd DGTE8PfLL2KMQG0jer8gSRX+t7X2xx2jjuffpDuKYwJ4wfdqsW4p09IpjUmWUkG9Fo nvrDJqYIggsK9Etslrb4VQNoAYxZYoeGCZM5Kpepx2HgT7RznmsZ7v35+pLRY9BXGu 4PAku9FqpWiQw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Maurizio Lombardi , Mike Christie , "Martin K . Petersen" , Sasha Levin , mgurtovoy@nvidia.com, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 5/9] scsi: target: iscsi: Fix an error message in iscsi_check_key() Date: Sun, 19 Mar 2023 20:57:03 -0400 Message-Id: <20230320005707.1429405-5-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230320005707.1429405-1-sashal@kernel.org> References: <20230320005707.1429405-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Maurizio Lombardi [ Upstream commit 6cc55c969b7ce8d85e09a636693d4126c3676c11 ] The first half of the error message is printed by pr_err(), the second half is printed by pr_debug(). The user will therefore see only the first part of the message and will miss some useful information. Link: https://lore.kernel.org/r/20230214141556.762047-1-mlombard@redhat.com Signed-off-by: Maurizio Lombardi Reviewed-by: Mike Christie Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/target/iscsi/iscsi_target_parameters.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c index 29a37b242d30a..01f93de93c8c7 100644 --- a/drivers/target/iscsi/iscsi_target_parameters.c +++ b/drivers/target/iscsi/iscsi_target_parameters.c @@ -1270,18 +1270,20 @@ static struct iscsi_param *iscsi_check_key( return param; if (!(param->phase & phase)) { - pr_err("Key \"%s\" may not be negotiated during ", - param->name); + char *phase_name; + switch (phase) { case PHASE_SECURITY: - pr_debug("Security phase.\n"); + phase_name = "Security"; break; case PHASE_OPERATIONAL: - pr_debug("Operational phase.\n"); + phase_name = "Operational"; break; default: - pr_debug("Unknown phase.\n"); + phase_name = "Unknown"; } + pr_err("Key \"%s\" may not be negotiated during %s phase.\n", + param->name, phase_name); return NULL; } -- 2.39.2