| Message ID | 20230214141556.762047-1-mlombard@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6cc55c969b7ce8d85e09a636693d4126c3676c11 |
| Headers | show |
| Series | target: iscsi: fix an error message in iscsi_check_key() | expand |
On 2/14/23 8:15 AM, Maurizio Lombardi wrote: > 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. > > Signed-off-by: Maurizio Lombardi <mlombard@redhat.com> > --- > 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 2317fb077db0..557516c642c3 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; > } > Reviewed-by: Mike Christie <michael.christie@oracle.com>
On Tue, 14 Feb 2023 15:15:56 +0100, Maurizio Lombardi wrote: > 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. > > Applied to 6.3/scsi-fixes, thanks! [1/1] target: iscsi: fix an error message in iscsi_check_key() https://git.kernel.org/mkp/scsi/c/6cc55c969b7c
diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c index 2317fb077db0..557516c642c3 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; }
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. Signed-off-by: Maurizio Lombardi <mlombard@redhat.com> --- drivers/target/iscsi/iscsi_target_parameters.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)