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 3C376C6FD1F for ; Mon, 20 Mar 2023 01:06:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231596AbjCTBGZ (ORCPT ); Sun, 19 Mar 2023 21:06:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231403AbjCTBDk (ORCPT ); Sun, 19 Mar 2023 21:03:40 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D2932411F; Sun, 19 Mar 2023 17:57:53 -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 ams.source.kernel.org (Postfix) with ESMTPS id 519E9B80D42; Mon, 20 Mar 2023 00:56:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 152D6C433D2; Mon, 20 Mar 2023 00:56:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679273811; bh=K+V39EeKe6iCTrbQd/BlGo1gjFZe4Ik03rVWVFz+ysk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eAEaK25AHrymu75/LLRcR6OJngGNuZPJ943HeLZCtqCRvuFpUas3dZd3YcesH/30V t0ji0jTSjgKAUkRPrMU1CtGRQLbmMuttKDYr/5GwD23kbMSckRUvP2oUIDhB5+o+wM zCX4Cmw7mPMX6tPH4dXkfqfYkrBMEumnIxvxX5psdIol4GjYaFKXmWuUE9U4ph6z/S c3IDVoSYHhvf6abK69cq0do7Lbksw/VFID7siimwVReQrblfHqJb2X45o1QlHTVGjL C7vemrwAiWc6Wg0oUoODcAXHhG8t9/JG0JdnAdpCxBO/U68arwHeo+jVltjwZxDJFE Q/gu2II4YbhZA== 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 5.4 06/12] scsi: target: iscsi: Fix an error message in iscsi_check_key() Date: Sun, 19 Mar 2023 20:56:29 -0400 Message-Id: <20230320005636.1429242-6-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230320005636.1429242-1-sashal@kernel.org> References: <20230320005636.1429242-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 7a461fbb15668..31cd3c02e5176 100644 --- a/drivers/target/iscsi/iscsi_target_parameters.c +++ b/drivers/target/iscsi/iscsi_target_parameters.c @@ -1262,18 +1262,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