From: Tony Asleson <tasleson@redhat.com>
To: linux-scsi@vger.kernel.org, linux-block@vger.kernel.org,
linux-fsdevel@vger.kernel.org
Subject: [RFC 8/9] ata_dev_printk: Add durable name to output
Date: Mon, 23 Dec 2019 16:55:57 -0600 [thread overview]
Message-ID: <20191223225558.19242-9-tasleson@redhat.com> (raw)
In-Reply-To: <20191223225558.19242-1-tasleson@redhat.com>
If we have a durable name we will add to output, else
we will default to existing message output format.
Signed-off-by: Tony Asleson <tasleson@redhat.com>
---
drivers/ata/libata-core.c | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 28c492be0a57..b57a74cfb529 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -7249,6 +7249,9 @@ EXPORT_SYMBOL(ata_link_printk);
void ata_dev_printk(const struct ata_device *dev, const char *level,
const char *fmt, ...)
{
+ char dict[128];
+ int dict_len = 0;
+
struct va_format vaf;
va_list args;
@@ -7257,9 +7260,26 @@ void ata_dev_printk(const struct ata_device *dev, const char *level,
vaf.fmt = fmt;
vaf.va = &args;
- printk("%sata%u.%02u: %pV",
- level, dev->link->ap->print_id, dev->link->pmp + dev->devno,
- &vaf);
+ if (dev->sdev) {
+ dict_len = dev_durable_name(
+ &dev->sdev->sdev_gendev,
+ dict,
+ sizeof(dict));
+ }
+
+ if (dict_len > 0) {
+ printk_emit(0, level[1] - '0', dict, dict_len,
+ "sata%u.%02u: %pV",
+ dev->link->ap->print_id,
+ dev->link->pmp + dev->devno,
+ &vaf);
+ } else {
+ printk("%sata%u.%02u: %pV",
+ level,
+ dev->link->ap->print_id,
+ dev->link->pmp + dev->devno,
+ &vaf);
+ }
va_end(args);
}
--
2.21.0
next prev parent reply other threads:[~2019-12-23 22:56 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-23 22:55 [RFC 0/9] Add persistent durable identifier to storage log messages Tony Asleson
2019-12-23 22:55 ` [RFC 1/9] lib/string: Add function to trim duplicate WS Tony Asleson
2019-12-23 23:28 ` Matthew Wilcox
2020-01-02 22:52 ` Tony Asleson
2020-01-03 14:30 ` Tony Asleson
2019-12-23 22:55 ` [RFC 2/9] printk: Bring back printk_emit Tony Asleson
2019-12-23 22:55 ` [RFC 3/9] printk: Add printk_emit_ratelimited macro Tony Asleson
2019-12-23 22:55 ` [RFC 4/9] struct device_type: Add function callback durable_name Tony Asleson
2019-12-23 22:55 ` [RFC 5/9] block: Add support functions for persistent durable name Tony Asleson
2019-12-23 22:55 ` [RFC 6/9] create_syslog_header: Add " Tony Asleson
2019-12-24 0:54 ` James Bottomley
2020-01-02 22:53 ` Tony Asleson
2019-12-23 22:55 ` [RFC 7/9] print_req_error: Add persistent " Tony Asleson
2019-12-23 22:55 ` Tony Asleson [this message]
2019-12-24 0:56 ` [RFC 8/9] ata_dev_printk: Add durable name to output James Bottomley
2019-12-23 22:55 ` [RFC 9/9] __xfs_printk: " Tony Asleson
2020-01-04 2:56 ` Dave Chinner
2020-01-06 2:45 ` Tony Asleson
2020-01-06 22:02 ` Dave Chinner
2020-01-07 0:19 ` Sweet Tea Dorminy
2020-01-07 1:23 ` Dave Chinner
2020-01-07 17:01 ` Tony Asleson
2020-01-08 2:10 ` Dave Chinner
2020-01-08 16:53 ` Tony Asleson
2020-01-09 1:41 ` Alasdair G Kergon
2020-01-09 23:22 ` Dave Chinner
2020-01-10 1:28 ` Alasdair G Kergon
2020-01-10 16:13 ` Tony Asleson
2019-12-24 0:50 ` [RFC 0/9] Add persistent durable identifier to storage log messages James Bottomley
2020-01-02 22:52 ` 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=20191223225558.19242-9-tasleson@redhat.com \
--to=tasleson@redhat.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@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).