diff mbox series

[v4,10/11] print_req_error: Use durable_name_printk_ratelimited

Message ID 20200724171706.1550403-11-tasleson@redhat.com (mailing list archive)
State New, archived
Headers show
Series Add persistent durable identifier to storage log messages | expand

Commit Message

Tony Asleson July 24, 2020, 5:17 p.m. UTC
Replace printk_ratelimited with one that adds the key/value
durable name to log entry.

Signed-off-by: Tony Asleson <tasleson@redhat.com>
---
 block/blk-core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Sergei Shtylyov July 25, 2020, 9:15 a.m. UTC | #1
On 24.07.2020 20:17, Tony Asleson wrote:

> Replace printk_ratelimited with one that adds the key/value
> durable name to log entry.
> 
> Signed-off-by: Tony Asleson <tasleson@redhat.com>
> ---
>   block/blk-core.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/block/blk-core.c b/block/blk-core.c
> index 9bfaee050c82..a1f35e3e21d8 100644
> --- a/block/blk-core.c
> +++ b/block/blk-core.c
> @@ -213,12 +213,15 @@ EXPORT_SYMBOL_GPL(blk_status_to_errno);
>   static void print_req_error(struct request *req, blk_status_t status,
>   		const char *caller)
>   {
> +	struct device *dev;
>   	int idx = (__force int)status;
>   
>   	if (WARN_ON_ONCE(idx >= ARRAY_SIZE(blk_errors)))
>   		return;
>   
> -	printk_ratelimited(KERN_ERR
> +	dev = (req->rq_disk) ? disk_to_dev(req->rq_disk) : NULL;

    The 1st () not necessary, here iand in the next patch...

[...]

MBR, Sergei
diff mbox series

Patch

diff --git a/block/blk-core.c b/block/blk-core.c
index 9bfaee050c82..a1f35e3e21d8 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -213,12 +213,15 @@  EXPORT_SYMBOL_GPL(blk_status_to_errno);
 static void print_req_error(struct request *req, blk_status_t status,
 		const char *caller)
 {
+	struct device *dev;
 	int idx = (__force int)status;
 
 	if (WARN_ON_ONCE(idx >= ARRAY_SIZE(blk_errors)))
 		return;
 
-	printk_ratelimited(KERN_ERR
+	dev = (req->rq_disk) ? disk_to_dev(req->rq_disk) : NULL;
+
+	durable_name_printk_ratelimited(KERN_ERR, dev,
 		"%s: %s error, dev %s, sector %llu op 0x%x:(%s) flags 0x%x "
 		"phys_seg %u prio class %u\n",
 		caller, blk_errors[idx].name,