2019-11-13 23:23:57

by Matt Bennett

Subject: [PATCH] tipc: add back tipc prefix to log messages

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

This is still a useful prefix so add it back.

Signed-off-by: Matt Bennett <[email protected]>
---
net/tipc/core.c | 2 --
net/tipc/core.h | 6 ++++++
2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net/tipc/core.c b/net/tipc/core.c
index 23cb379a93d6..8f35060a24e1 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 60d829581068..3042f654e0af 100644
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -60,6 +60,12 @@
#include <linux/rhashtable.h>
#include <net/genetlink.h>

+#ifdef pr_fmt
+#undef pr_fmt
+#endif
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
struct tipc_node;
struct tipc_bearer;
struct tipc_bc_base;
--
2.24.0

2019-11-13 23:44:02

by Jon Maloy

Subject: RE: [PATCH] tipc: add back tipc prefix to log messages

Acked-by: Jon Maloy <[email protected]>

> -----Original Message-----
> From: [email protected] <[email protected]> On Behalf Of Matt Bennett
> Sent: 13-Nov-19 18:20
> To: Jon Maloy <[email protected]>; [email protected]; [email protected];
> [email protected]; [email protected]
> Cc: [email protected]; Matt Bennett <[email protected]>
> Subject: [PATCH] tipc: add back tipc prefix to log messages
>
> The tipc prefix for log messages generated by tipc was
> removed in commit 07f6c4bc048a ("tipc: convert tipc reference
> table to use generic rhashtable").
>
> This is still a useful prefix so add it back.
>
> Signed-off-by: Matt Bennett <[email protected]>
> ---
> net/tipc/core.c | 2 --
> net/tipc/core.h | 6 ++++++
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/net/tipc/core.c b/net/tipc/core.c
> index 23cb379a93d6..8f35060a24e1 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 60d829581068..3042f654e0af 100644
> --- a/net/tipc/core.h
> +++ b/net/tipc/core.h
> @@ -60,6 +60,12 @@
> #include <linux/rhashtable.h>
> #include <net/genetlink.h>
>
> +#ifdef pr_fmt
> +#undef pr_fmt
> +#endif
> +
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> struct tipc_node;
> struct tipc_bearer;
> struct tipc_bc_base;
> --
> 2.24.0

2019-11-15 02:04:55

by David Miller

Subject: Re: [PATCH] tipc: add back tipc prefix to log messages

From: Matt Bennett <[email protected]>
Date: Thu, 14 Nov 2019 12:20:03 +1300

> The tipc prefix for log messages generated by tipc was
> removed in commit 07f6c4bc048a ("tipc: convert tipc reference
> table to use generic rhashtable").
>
> This is still a useful prefix so add it back.
>
> Signed-off-by: Matt Bennett <[email protected]>

Applied.