Re: [v4 05/11] nvme: Add durable name for dev_printk

[Sergei Shtylyov <sergei.shtylyov@gmail.com>]

Hello!

On 24.07.2020 20:17, Tony Asleson wrote:

> Corrections from Keith Busch review comments.
> 
> Signed-off-by: Tony Asleson <tasleson@redhat.com>
> ---
>   drivers/nvme/host/core.c | 18 ++++++++++++++++++
>   1 file changed, 18 insertions(+)
> 
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index f3c037f5a9ba..f2e5b91668a1 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -2667,6 +2667,22 @@ static bool nvme_validate_cntlid(struct nvme_subsystem *subsys,
>   	return true;
>   }
>   
> +static ssize_t wwid_show(struct device *dev, struct device_attribute *attr,
> +			char *buf);
> +
> +static int dev_to_nvme_durable_name(const struct device *dev, char *buf, size_t len)
> +{
> +	char serial[144];	/* Max 141 for wwid_show */
> +	ssize_t serial_len = wwid_show((struct device *)dev, NULL, serial);
> +
> +	if (serial_len > 0 && serial_len < len) {
> +		serial_len -= 1;  /* Remove the '\n' from the string */

    serial_len-- instead?

> +		strncpy(buf, serial, serial_len);
> +		return serial_len;
> +	}
> +	return 0;
> +}
> +
>   static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
>   {
>   	struct nvme_sub
[...]

MBR, Sergei