> -----Original Message-----
> From: linux-scsi-ow...@vger.kernel.org [mailto:linux-scsi-
> ow...@vger.kernel.org] On Behalf Of Yoshihiro YUNOMAE
> Sent: Friday, 08 August, 2014 6:50 AM
...
> Subject: [RFC PATCH 01/10] scsi/constants: Cleanup printk message in
> __scsi_print_sense()
> 
> A device name is output like "sda: Sense Key : Medium Error [current]"
> in __scsi_print_sense(), but it should be "[sda] Sense Key : Medium Error
> [current]" because other printk messages output a device name like "[sda]
> foo."
> 
...
> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
> index c6a7a4a..a0e8159 100644
> --- a/drivers/scsi/constants.c
> +++ b/drivers/scsi/constants.c
> @@ -1470,7 +1470,7 @@ void __scsi_print_sense(struct scsi_device *sdev,
> const char *name,
>               return;
>       }
> 
> -     sdev_printk(KERN_INFO, sdev, "%s: Sense Key : %s %s%s\n", name,
> +     sdev_printk(KERN_INFO, sdev, "[%s] Sense Key : %s %s%s\n", name,
>              scsi_sense_key_string(sshdr.sense_key),
>              scsi_sense_type_string(&sshdr),
>              scsi_sense_format_string(&sshdr));
> 


The callers of __scsi_print_sense do not always pass in a name
like "sda".  In fact, sd.c doesn't even call that function; its
sd_print_sense_hdr calls sd_printk (which prints name as "[%s]")
and scsi_show_sense_hdr.

There are just 3 kernel files that call this function:
osst.c:                 __scsi_print_sense("osst ", SRpnt->sense, 
SCSI_SENSE_BUFFERSIZE);
osst.c:                 __scsi_print_sense("osst ", SRpnt->sense, 
SCSI_SENSE_BUFFERSIZE);
There is a separate call to printk just before each of those,
which prints out the name, without [].

sg.c:                   __scsi_print_sense(__func__, sense,
That's printing the C function name.

st.c:                    __scsi_print_sense(name, SRpnt->sense, 
SCSI_SENSE_BUFFERSIZE);
st.c:                   __scsi_print_sense(name, SRpnt->sense, 
SCSI_SENSE_BUFFERSIZE);
This is more like what you have in mind.


---
Rob Elliott    HP Server Storage


N�����r��y����b�X��ǧv�^�)޺{.n�+����{���"�{ay�ʇڙ�,j��f���h���z��w���
���j:+v���w�j�m��������zZ+�����ݢj"��!�i

Reply via email to