2021-11-17 13:26:54

by Thiago Rafael Becker

Subject: [PATCH] sunrpc: fix header include guard in trace header

rpcgss.h include protection was protecting against the define for
rpcrdma.h.

Signed-off-by: Thiago Rafael Becker <[email protected]>
---
include/trace/events/rpcgss.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/trace/events/rpcgss.h b/include/trace/events/rpcgss.h
index 3ba63319af3c..c9048f3e471b 100644
--- a/include/trace/events/rpcgss.h
+++ b/include/trace/events/rpcgss.h
@@ -8,7 +8,7 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM rpcgss

-#if !defined(_TRACE_RPCRDMA_H) || defined(TRACE_HEADER_MULTI_READ)
+#if !defined(_TRACE_RPCGSS_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_RPCGSS_H

#include <linux/tracepoint.h>
--
2.31.1

2021-11-21 19:34:15

by Chuck Lever III

Subject: Re: [PATCH] sunrpc: fix header include guard in trace header

> On Nov 17, 2021, at 8:26 AM, Thiago Rafael Becker <[email protected]> wrote:
>
> rpcgss.h include protection was protecting against the define for
> rpcrdma.h.
>
> Signed-off-by: Thiago Rafael Becker <[email protected]>
> ---
> include/trace/events/rpcgss.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/trace/events/rpcgss.h b/include/trace/events/rpcgss.h
> index 3ba63319af3c..c9048f3e471b 100644
> --- a/include/trace/events/rpcgss.h
> +++ b/include/trace/events/rpcgss.h
> @@ -8,7 +8,7 @@
> #undef TRACE_SYSTEM
> #define TRACE_SYSTEM rpcgss
>
> -#if !defined(_TRACE_RPCRDMA_H) || defined(TRACE_HEADER_MULTI_READ)
> +#if !defined(_TRACE_RPCGSS_H) || defined(TRACE_HEADER_MULTI_READ)
> #define _TRACE_RPCGSS_H
>
> #include <linux/tracepoint.h>
> --
> 2.31.1
>

I can take this patch for v5.17 if no-one else has already grabbed it.


--
Chuck Lever

2021-11-21 20:18:44

by Steven Rostedt

Subject: Re: [PATCH] sunrpc: fix header include guard in trace header

On Sun, 21 Nov 2021 19:33:46 +0000
Chuck Lever III <[email protected]> wrote:

> > #include <linux/tracepoint.h>
> > --
> > 2.31.1
> >
>
> I can take this patch for v5.17 if no-one else has already grabbed it.

Acked-by: Steven Rostedt (VMware) <[email protected]>

-- Steve