From: Tony Asleson <tasleson@redhat.com>
To: linux-block@vger.kernel.org, linux-ide@vger.kernel.org,
linux-scsi@vger.kernel.org, b.zolnierkie@samsung.com,
axboe@kernel.dk
Subject: [v4 05/11] nvme: Add durable name for dev_printk
Date: Fri, 24 Jul 2020 12:17:00 -0500 [thread overview]
Message-ID: <20200724171706.1550403-6-tasleson@redhat.com> (raw)
In-Reply-To: <20200724171706.1550403-1-tasleson@redhat.com>
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 */
+ 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_subsystem *subsys, *found;
@@ -3616,6 +3632,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;
__nvme_revalidate_disk(disk, id);
--
2.26.2
next prev parent reply other threads:[~2020-07-24 17:17 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-24 17:16 [v4 00/11] Add persistent durable identifier to storage log messages Tony Asleson
2020-07-24 17:16 ` [v4 01/11] struct device: Add function callback durable_name Tony Asleson
2020-07-24 17:16 ` [v4 02/11] create_syslog_header: Add durable name Tony Asleson
2020-07-24 17:16 ` [v4 03/11] dev_vprintk_emit: Increase hdr size Tony Asleson
2020-07-25 10:05 ` Andy Shevchenko
2020-08-26 18:26 ` Tony Asleson
2020-07-24 17:16 ` [v4 04/11] scsi: Add durable_name for dev_printk Tony Asleson
2020-07-25 10:20 ` Andy Shevchenko
2020-07-24 17:17 ` Tony Asleson [this message]
2020-07-25 9:05 ` [v4 05/11] nvme: Add durable name " Sergei Shtylyov
2020-07-25 10:23 ` Andy Shevchenko
2020-07-24 17:17 ` [v4 06/11] libata: Add ata_scsi_durable_name Tony Asleson
2020-07-25 0:48 ` kernel test robot
2020-07-25 1:07 ` kernel test robot
2020-07-25 1:07 ` [RFC PATCH] libata: ata_scsi_durable_name() can be static kernel test robot
2020-07-25 1:18 ` [v4 06/11] libata: Add ata_scsi_durable_name kernel test robot
2020-07-25 10:26 ` Andy Shevchenko
2020-07-24 17:17 ` [v4 07/11] Add durable_name_printk Tony Asleson
2020-07-24 17:17 ` [v4 08/11] libata: use durable_name_printk Tony Asleson
2020-07-24 17:17 ` [v4 09/11] Add durable_name_printk_ratelimited Tony Asleson
2020-07-24 17:17 ` [v4 10/11] print_req_error: Use durable_name_printk_ratelimited Tony Asleson
2020-07-25 9:15 ` Sergei Shtylyov
2020-07-24 17:17 ` [v4 11/11] buffer_io_error: " Tony Asleson
2020-07-25 10:29 ` Andy Shevchenko
2020-07-26 15:10 ` [v4 00/11] Add persistent durable identifier to storage log messages Christoph Hellwig
2020-07-27 15:45 ` Tony Asleson
2020-07-27 16:46 ` Hannes Reinecke
2020-07-27 17:42 ` Tony Asleson
2020-07-27 19:17 ` Douglas Gilbert
2020-07-27 20:27 ` 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=20200724171706.1550403-6-tasleson@redhat.com \
--to=tasleson@redhat.com \
--cc=axboe@kernel.dk \
--cc=b.zolnierkie@samsung.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).