From: Tony Asleson <tasleson@redhat.com>
To: linux-scsi@vger.kernel.org, linux-block@vger.kernel.org,
linux-ide@vger.kernel.org
Subject: [v5 05/12] nvme: Add durable name for dev_printk
Date: Fri, 25 Sep 2020 11:19:22 -0500 [thread overview]
Message-ID: <20200925161929.1136806-6-tasleson@redhat.com> (raw)
In-Reply-To: <20200925161929.1136806-1-tasleson@redhat.com>
Changed the comment from // to /* and re-worked buffer
space needed for formatting wwid as requested by
Keith Busch.
ref.
https://lore.kernel.org/linux-block/20200513230455.GA1503@redsun51.ssa.fujisawa.hgst.com/
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 4ee2330c603e..2e3b808c7815 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2734,6 +2734,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)
+{
+ /*
+ * Max 141 needed for wwid_show, make sure we have the space available
+ * in our buffer before we format the wwid directly into it.
+ */
+ if (len >= 141) {
+ ssize_t wwid_len = wwid_show((struct device *)dev, NULL, buf);
+ return wwid_len > 0 ? wwid_len - 1 : 0; /* remove '\n' */
+ }
+ return 0;
+}
+
static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
{
struct nvme_subsystem *subsys, *found;
@@ -3663,6 +3679,8 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
disk->queue = ns->queue;
disk->flags = flags;
memcpy(disk->disk_name, disk_name, DISK_NAME_LEN);
+ disk_to_dev(disk)->durable_name = dev_to_nvme_durable_name;
+
ns->disk = disk;
if (__nvme_revalidate_disk(disk, id))
--
2.26.2
next prev parent reply other threads:[~2020-09-25 16:19 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-25 16:19 [v5 00/12] Add persistent durable identifier to storage log messages Tony Asleson
2020-09-25 16:19 ` [v5 01/12] struct device: Add function callback durable_name Tony Asleson
2020-09-26 9:08 ` Sergei Shtylyov
2020-09-27 14:22 ` Tony Asleson
2020-09-27 16:15 ` Sergei Shtylyov
2020-09-29 17:51 ` Christoph Hellwig
2020-09-29 18:04 ` Greg Kroah-Hartman
2020-09-29 22:04 ` Tony Asleson
2020-09-30 7:38 ` Greg Kroah-Hartman
2020-09-30 7:40 ` Greg Kroah-Hartman
2020-09-30 14:35 ` Tony Asleson
2020-10-01 11:48 ` Greg Kroah-Hartman
2020-10-07 20:10 ` Tony Asleson
2020-10-08 4:48 ` Greg Kroah-Hartman
2020-10-08 20:49 ` Martin K. Petersen
2020-10-08 5:54 ` Hannes Reinecke
2020-10-08 6:22 ` Finn Thain
2020-09-25 16:19 ` [v5 02/12] create_syslog_header: Add durable name Tony Asleson
2020-09-25 16:19 ` [v5 03/12] dev_vprintk_emit: Increase hdr size Tony Asleson
2020-09-25 16:19 ` [v5 04/12] scsi: Add durable_name for dev_printk Tony Asleson
2020-09-25 16:19 ` Tony Asleson [this message]
2020-09-25 16:19 ` [v5 06/12] libata: Add ata_scsi_durable_name Tony Asleson
2020-09-25 16:19 ` [v5 07/12] libata: Make ata_scsi_durable_name static Tony Asleson
2020-09-26 8:40 ` Sergei Shtylyov
2020-09-26 14:17 ` Tony Asleson
2020-09-26 15:57 ` James Bottomley
2020-09-28 20:35 ` Tony Asleson
2020-09-25 16:19 ` [v5 08/12] Add durable_name_printk Tony Asleson
2020-09-26 23:53 ` Randy Dunlap
2020-09-28 15:52 ` Tony Asleson
2020-09-28 17:32 ` Randy Dunlap
2020-09-25 16:19 ` [v5 09/12] libata: use durable_name_printk Tony Asleson
2020-09-25 16:19 ` [v5 10/12] Add durable_name_printk_ratelimited Tony Asleson
2020-09-25 16:19 ` [v5 11/12] print_req_error: Use durable_name_printk_ratelimited Tony Asleson
2020-09-25 16:19 ` [v5 12/12] buffer_io_error: " Tony Asleson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200925161929.1136806-6-tasleson@redhat.com \
--to=tasleson@redhat.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).