tipc-discussion

[tipc-discussion] [net-next PATCH 1/1] tipc: add back tipc prefix to log messages

[John T. <tho...@gm...>]

The tipc prefix to log messages generated by tipc was
removed in commit 07f6c4bc0 ("tipc: convert tipc reference
table to use generic rhashtable").

This is still a useful prefix and so add it back.

Acked-by: Jon Maloy <jon...@er...>
Signed-off-by: John Thompson <tho...@gm...>
---
 net/tipc/core.c | 2 --
 net/tipc/core.h | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/tipc/core.c b/net/tipc/core.c
index 0b982d048fb9..4cd9e57446ec 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -34,8 +34,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */

-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include "core.h"
 #include "name_table.h"
 #include "subscr.h"
diff --git a/net/tipc/core.h b/net/tipc/core.h
index 964342689f2c..f89f9a3c18c2 100644
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -37,6 +37,8 @@
 #ifndef _TIPC_CORE_H
 #define _TIPC_CORE_H

+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/tipc.h>
 #include <linux/tipc_config.h>
 #include <linux/tipc_netlink.h>
-- 
2.15.0

[tipc-discussion] [net-next PATCH 1/1] tipc: add back tipc prefix to log messages

[John T. <tho...@gm...>]

The tipc prefix to log messages generated by tipc was
removed in commit 07f6c4bc0 ("tipc: convert tipc reference
table to use generic rhashtable").

This is still a useful prefix and so add it back.

Acked-by: Jon Maloy <jon...@er...>
Signed-off-by: John Thompson <tho...@gm...>
---
 net/tipc/core.c | 2 --
 net/tipc/core.h | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/tipc/core.c b/net/tipc/core.c
index 0b982d048fb9..4cd9e57446ec 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -34,8 +34,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */

-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include "core.h"
 #include "name_table.h"
 #include "subscr.h"
diff --git a/net/tipc/core.h b/net/tipc/core.h
index 964342689f2c..f89f9a3c18c2 100644
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -37,6 +37,8 @@
 #ifndef _TIPC_CORE_H
 #define _TIPC_CORE_H

+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/tipc.h>
 #include <linux/tipc_config.h>
 #include <linux/tipc_netlink.h>
-- 
2.15.0

Re: [tipc-discussion] [net-next PATCH 1/1] tipc: add back tipc prefix to log messages

[David M. <da...@da...>]

From: John Thompson <tho...@gm...>
Date: Wed, 10 Jan 2018 08:50:24 +1300

> The tipc prefix to log messages generated by tipc was
> removed in commit 07f6c4bc0 ("tipc: convert tipc reference
> table to use generic rhashtable").
> 
> This is still a useful prefix and so add it back.
> 
> Acked-by: Jon Maloy <jon...@er...>
> Signed-off-by: John Thompson <tho...@gm...>

Applied, thank you.

Re: [tipc-discussion] [net-next PATCH 1/1] tipc: add back tipc prefix to log messages

[David M. <da...@da...>]

From: David Miller <da...@da...>
Date: Mon, 15 Jan 2018 13:42:45 -0500 (EST)

> From: John Thompson <tho...@gm...>
> Date: Wed, 10 Jan 2018 08:50:24 +1300
> 
>> The tipc prefix to log messages generated by tipc was
>> removed in commit 07f6c4bc0 ("tipc: convert tipc reference
>> table to use generic rhashtable").
>> 
>> This is still a useful prefix and so add it back.
>> 
>> Acked-by: Jon Maloy <jon...@er...>
>> Signed-off-by: John Thompson <tho...@gm...>
> 
> Applied, thank you.

Actually, this breaks the build, reverted:

In file included from net/tipc/addr.h:44:0,
                 from net/tipc/addr.c:38:
net/tipc/core.h:40:0: warning: "pr_fmt" redefined
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
In file included from ./include/linux/kernel.h:14:0,
                 from net/tipc/addr.c:37:
./include/linux/printk.h:285:0: note: this is the location of the previous definition
 #define pr_fmt(fmt) fmt