[PATCH] nbd: add missing definition of pr_fmt

[PATCH] nbd: add missing definition of pr_fmt

[Yu Kuai]

From: Yu Kuai <yukuai3@huawei.com>

commit 1243172d5894 ("nbd: use pr_err to output error message") tries
to define pr_fmt and use short pr_err() to output error message,
however, the definition is missed.

Fixes: 1243172d5894 ("nbd: use pr_err to output error message")
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
 drivers/block/nbd.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 07f3c139a3d7..94a1602adab5 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -44,6 +44,9 @@
 #include <linux/nbd-netlink.h>
 #include <net/genetlink.h>
 
+#undef pr_fmt
+#define pr_fmt(fmt) "nbd: " fmt
+
 #define CREATE_TRACE_POINTS
 #include <trace/events/nbd.h>
 
-- 
2.31.1

Re: [PATCH] nbd: add missing definition of pr_fmt

[Yu Kuai]

在 2022/07/06 17:33, Yu Kuai 写道:
> From: Yu Kuai <yukuai3@huawei.com>
> 
> commit 1243172d5894 ("nbd: use pr_err to output error message") tries
> to define pr_fmt and use short pr_err() to output error message,
> however, the definition is missed.

friendly ping ...
> 
> Fixes: 1243172d5894 ("nbd: use pr_err to output error message")
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
> ---
>   drivers/block/nbd.c | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
> index 07f3c139a3d7..94a1602adab5 100644
> --- a/drivers/block/nbd.c
> +++ b/drivers/block/nbd.c
> @@ -44,6 +44,9 @@
>   #include <linux/nbd-netlink.h>
>   #include <net/genetlink.h>
>   
> +#undef pr_fmt
> +#define pr_fmt(fmt) "nbd: " fmt
> +
>   #define CREATE_TRACE_POINTS
>   #include <trace/events/nbd.h>
>   
> 

Re: [PATCH] nbd: add missing definition of pr_fmt

[Joe Perches]

On Mon, 2022-07-18 at 21:52 +0800, Yu Kuai wrote:
> 在 2022/07/06 17:33, Yu Kuai 写道:
> > From: Yu Kuai <yukuai3@huawei.com>
> > 
> > commit 1243172d5894 ("nbd: use pr_err to output error message") tries
> > to define pr_fmt and use short pr_err() to output error message,
> > however, the definition is missed.
> 
> friendly ping ...
[]
> > diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
[]
> > @@ -44,6 +44,9 @@
> >   #include <linux/nbd-netlink.h>
> >   #include <net/genetlink.h>
> >   
> > +#undef pr_fmt
> > +#define pr_fmt(fmt) "nbd: " fmt
> > +

Typically, this #define is place before all #include lines
so there is no need for an #undef

Re: [PATCH] nbd: add missing definition of pr_fmt

[Yu Kuai]

Hi !

在 2022/07/18 22:32, Joe Perches 写道:
> On Mon, 2022-07-18 at 21:52 +0800, Yu Kuai wrote:
>> 在 2022/07/06 17:33, Yu Kuai 写道:
>>> From: Yu Kuai <yukuai3@huawei.com>
>>>
>>> commit 1243172d5894 ("nbd: use pr_err to output error message") tries
>>> to define pr_fmt and use short pr_err() to output error message,
>>> however, the definition is missed.
>> friendly ping ...
> []
>>> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
> []
>>> @@ -44,6 +44,9 @@
>>>    #include <linux/nbd-netlink.h>
>>>    #include <net/genetlink.h>
>>>    
>>> +#undef pr_fmt
>>> +#define pr_fmt(fmt) "nbd: " fmt
>>> +
> Typically, this #define is place before all #include lines
> so there is no need for an #undef

Thanks for you advice, I'll do that in v2.

Kuai

Re: [PATCH] nbd: add missing definition of pr_fmt

[Yu Kuai]

Hi!

在 2022/07/20 19:46, Yu Kuai 写道:
> Hi !
> 
> 在 2022/07/18 22:32, Joe Perches 写道:
>> On Mon, 2022-07-18 at 21:52 +0800, Yu Kuai wrote:
>>> 在 2022/07/06 17:33, Yu Kuai 写道:
>>>> From: Yu Kuai <yukuai3@huawei.com>
>>>>
>>>> commit 1243172d5894 ("nbd: use pr_err to output error message") tries
>>>> to define pr_fmt and use short pr_err() to output error message,
>>>> however, the definition is missed.
>>> friendly ping ...
>> []
>>>> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
>> []
>>>> @@ -44,6 +44,9 @@
>>>>    #include <linux/nbd-netlink.h>
>>>>    #include <net/genetlink.h>
>>>> +#undef pr_fmt
>>>> +#define pr_fmt(fmt) "nbd: " fmt
>>>> +

I tried to remove the #undef:

--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -44,7 +44,6 @@
  #include <linux/nbd-netlink.h>
  #include <net/genetlink.h>

  #define pr_fmt(fmt) "nbd: " fmt

And then following warning is triggered:

drivers/block/nbd.c:47: warning: "pr_fmt" redefined
    47 | #define pr_fmt(fmt) "nbd: " fmt

It semms that keeping that #undef is the right thing to do.

Thanks,
Kuai
>> Typically, this #define is place before all #include lines
>> so there is no need for an #undef
> 
> Thanks for you advice, I'll do that in v2.
> 
> Kuai
> 
> .
> 

Re: [PATCH] nbd: add missing definition of pr_fmt

[Yu Kuai]

Hi!

在 2022/07/20 19:46, Yu Kuai 写道:
> Hi !
> 
> 在 2022/07/18 22:32, Joe Perches 写道:
>> On Mon, 2022-07-18 at 21:52 +0800, Yu Kuai wrote:
>>> 在 2022/07/06 17:33, Yu Kuai 写道:
>>>> From: Yu Kuai <yukuai3@huawei.com>
>>>>
>>>> commit 1243172d5894 ("nbd: use pr_err to output error message") tries
>>>> to define pr_fmt and use short pr_err() to output error message,
>>>> however, the definition is missed.
>>> friendly ping ...
>> []
>>>> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
>> []
>>>> @@ -44,6 +44,9 @@
>>>>    #include <linux/nbd-netlink.h>
>>>>    #include <net/genetlink.h>
>>>> +#undef pr_fmt
>>>> +#define pr_fmt(fmt) "nbd: " fmt
>>>> +
>> Typically, this #define is place before all #include lines
>> so there is no need for an #undef

I tried to remove the #undef:

--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -44,7 +44,6 @@
  #include <linux/nbd-netlink.h>
  #include <net/genetlink.h>

  #define pr_fmt(fmt) "nbd: " fmt

And then following warning is triggered:

drivers/block/nbd.c:47: warning: "pr_fmt" redefined
    47 | #define pr_fmt(fmt) "nbd: " fmt

It semms that keeping that #undef is the right thing to do.

Thanks,
Kuai
> 
> Thanks for you advice, I'll do that in v2.
> 
> Kuai
> 
> .
> 

Re: [PATCH] nbd: add missing definition of pr_fmt

[Joe Perches]

On Sat, 2022-07-23 at 10:15 +0800, Yu Kuai wrote:
> Hi!

Hello.

> 在 2022/07/20 19:46, Yu Kuai 写道:
> > 在 2022/07/18 22:32, Joe Perches 写道:
> > > On Mon, 2022-07-18 at 21:52 +0800, Yu Kuai wrote:
> > > > 在 2022/07/06 17:33, Yu Kuai 写道:
> > > > > From: Yu Kuai <yukuai3@huawei.com>
> > > > > 
> > > > > commit 1243172d5894 ("nbd: use pr_err to output error message") tries
> > > > > to define pr_fmt and use short pr_err() to output error message,
> > > > > however, the definition is missed.
> > > > friendly ping ...
> > > []
> > > > > diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
> > > []
> > > > > @@ -44,6 +44,9 @@
> > > > >    #include <linux/nbd-netlink.h>
> > > > >    #include <net/genetlink.h>
> > > > > +#undef pr_fmt
> > > > > +#define pr_fmt(fmt) "nbd: " fmt
> > > > > +
> > > Typically, this #define is place before all #include lines
> > > so there is no need for an #undef
> 
> I tried to remove the #undef:

I'll repeat my message.

Move the #define before _any_ #include.

Also, there are some message that would need existing "nbd: " output
prefixes removed.
---
 drivers/block/nbd.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index f5d098a148cbf..222f26ac5e96a 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -11,6 +11,8 @@
  * (part of code stolen from loop.c)
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/major.h>
 
 #include <linux/blkdev.h>
@@ -1950,8 +1952,8 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
 			     test_bit(NBD_DISCONNECT_REQUESTED, &nbd->flags)) ||
 			    !refcount_inc_not_zero(&nbd->refs)) {
 				mutex_unlock(&nbd_index_mutex);
-				pr_err("nbd: device at index %d is going down\n",
-					index);
+				pr_err("device at index %d is going down\n",
+				       index);
 				return -EINVAL;
 			}
 		}
@@ -1961,7 +1963,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
 	if (!nbd) {
 		nbd = nbd_dev_add(index, 2);
 		if (IS_ERR(nbd)) {
-			pr_err("nbd: failed to add new device\n");
+			pr_err("failed to add new device\n");
 			return PTR_ERR(nbd);
 		}
 	}

Re: [PATCH] nbd: add missing definition of pr_fmt

[Yu Kuai]

Hi!

在 2022/07/23 11:12, Joe Perches 写道:
> On Sat, 2022-07-23 at 10:15 +0800, Yu Kuai wrote:
>> Hi!
> 
> Hello.
> 
>> 在 2022/07/20 19:46, Yu Kuai 写道:
>>> 在 2022/07/18 22:32, Joe Perches 写道:
>>>> On Mon, 2022-07-18 at 21:52 +0800, Yu Kuai wrote:
>>>>> 在 2022/07/06 17:33, Yu Kuai 写道:
>>>>>> From: Yu Kuai <yukuai3@huawei.com>
>>>>>>
>>>>>> commit 1243172d5894 ("nbd: use pr_err to output error message") tries
>>>>>> to define pr_fmt and use short pr_err() to output error message,
>>>>>> however, the definition is missed.
>>>>> friendly ping ...
>>>> []
>>>>>> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
>>>> []
>>>>>> @@ -44,6 +44,9 @@
>>>>>>     #include <linux/nbd-netlink.h>
>>>>>>     #include <net/genetlink.h>
>>>>>> +#undef pr_fmt
>>>>>> +#define pr_fmt(fmt) "nbd: " fmt
>>>>>> +
>>>> Typically, this #define is place before all #include lines
>>>> so there is no need for an #undef
>>
>> I tried to remove the #undef:
> 
> I'll repeat my message.
> 
> Move the #define before _any_ #include.
> 
> Also, there are some message that would need existing "nbd: " output
> prefixes removed.

Thanks for your explanation, I do miss that.

Kuai
> ---
>   drivers/block/nbd.c | 8 +++++---
>   1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
> index f5d098a148cbf..222f26ac5e96a 100644
> --- a/drivers/block/nbd.c
> +++ b/drivers/block/nbd.c
> @@ -11,6 +11,8 @@
>    * (part of code stolen from loop.c)
>    */
>   
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
>   #include <linux/major.h>
>   
>   #include <linux/blkdev.h>
> @@ -1950,8 +1952,8 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
>   			     test_bit(NBD_DISCONNECT_REQUESTED, &nbd->flags)) ||
>   			    !refcount_inc_not_zero(&nbd->refs)) {
>   				mutex_unlock(&nbd_index_mutex);
> -				pr_err("nbd: device at index %d is going down\n",
> -					index);
> +				pr_err("device at index %d is going down\n",
> +				       index);
>   				return -EINVAL;
>   			}
>   		}
> @@ -1961,7 +1963,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
>   	if (!nbd) {
>   		nbd = nbd_dev_add(index, 2);
>   		if (IS_ERR(nbd)) {
> -			pr_err("nbd: failed to add new device\n");
> +			pr_err("failed to add new device\n");
>   			return PTR_ERR(nbd);
>   		}
>   	}
> 
> 
> .
>