Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <c4cf82073cccd574aa75b3a8e1f15748929c7621.camel@perches.com>
Subject: Re: [PATCH] nbd: add missing definition of pr_fmt
From:   Joe Perches <joe@perches.com>
To:     Yu Kuai <yukuai1@huaweicloud.com>, Yu Kuai <yukuai3@huawei.com>,
        josef@toxicpanda.com, axboe@kernel.dk, houtao1@huawei.com
Cc:     linux-block@vger.kernel.org, nbd@other.debian.org,
        linux-kernel@vger.kernel.org, yi.zhang@huawei.com
Date:   Fri, 22 Jul 2022 20:12:39 -0700
In-Reply-To: <ec031ff1-3936-92ce-b66b-59e3e6a289ab@huaweicloud.com>
References: <20220706093320.1962871-1-yukuai1@huaweicloud.com>
         <853a5164-78cf-1ccb-8e18-cff5b5bce4ff@huaweicloud.com>
         <49a8099eb7dd01e9d2d190056171341d87cd442b.camel@perches.com>
         <0dba2f0c-ba02-853e-60e7-873eabedcd80@huaweicloud.com>
         <ec031ff1-3936-92ce-b66b-59e3e6a289ab@huaweicloud.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8BIT
User-Agent: Evolution 3.44.1-0ubuntu1 
MIME-Version: 1.0
Precedence: bulk

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);
 		}
 	}