Skip to content

Commit 247c01f

Browse files
chuckleverChuck Lever
authored andcommitted
trace: Relocate event helper files
Steven Rostedt says: > The include/trace/events/ directory should only hold files that > are to create events, not headers that hold helper functions. > > Can you please move them out of include/trace/events/ as that > directory is "special" in the creation of events. Signed-off-by: Chuck Lever <[email protected]> Acked-by: Leon Romanovsky <[email protected]> Acked-by: Steven Rostedt (Google) <[email protected]> Acked-by: Anna Schumaker <[email protected]>
1 parent 79a1d88 commit 247c01f

File tree

12 files changed

+19
-12
lines changed

12 files changed

+19
-12
lines changed

MAINTAINERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10055,6 +10055,7 @@ F: drivers/infiniband/
1005510055
F: include/rdma/
1005610056
F: include/trace/events/ib_mad.h
1005710057
F: include/trace/events/ib_umad.h
10058+
F: include/trace/misc/rdma.h
1005810059
F: include/uapi/linux/if_infiniband.h
1005910060
F: include/uapi/rdma/
1006010061
F: samples/bpf/ibumad_kern.c
@@ -11140,6 +11141,12 @@ F: fs/nfs_common/
1114011141
F: fs/nfsd/
1114111142
F: include/linux/lockd/
1114211143
F: include/linux/sunrpc/
11144+
F: include/trace/events/rpcgss.h
11145+
F: include/trace/events/rpcrdma.h
11146+
F: include/trace/events/sunrpc.h
11147+
F: include/trace/misc/fs.h
11148+
F: include/trace/misc/nfs.h
11149+
F: include/trace/misc/sunrpc.h
1114311150
F: include/uapi/linux/nfsd/
1114411151
F: include/uapi/linux/sunrpc/
1114511152
F: net/sunrpc/

drivers/infiniband/core/cm_trace.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <linux/tracepoint.h>
1818
#include <rdma/ib_cm.h>
19-
#include <trace/events/rdma.h>
19+
#include <trace/misc/rdma.h>
2020

2121
/*
2222
* enum ib_cm_state, from include/rdma/ib_cm.h

drivers/infiniband/core/cma_trace.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define _TRACE_RDMA_CMA_H
1616

1717
#include <linux/tracepoint.h>
18-
#include <trace/events/rdma.h>
18+
#include <trace/misc/rdma.h>
1919

2020

2121
DECLARE_EVENT_CLASS(cma_fsm_class,

fs/nfs/nfs4trace.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#define _TRACE_NFS4_H
1010

1111
#include <linux/tracepoint.h>
12-
#include <trace/events/sunrpc_base.h>
12+
#include <trace/misc/sunrpc.h>
1313

14-
#include <trace/events/fs.h>
15-
#include <trace/events/nfs.h>
14+
#include <trace/misc/fs.h>
15+
#include <trace/misc/nfs.h>
1616

1717
#define show_nfs_fattr_flags(valid) \
1818
__print_flags((unsigned long)valid, "|", \

fs/nfs/nfstrace.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#include <linux/tracepoint.h>
1212
#include <linux/iversion.h>
1313

14-
#include <trace/events/fs.h>
15-
#include <trace/events/nfs.h>
16-
#include <trace/events/sunrpc_base.h>
14+
#include <trace/misc/fs.h>
15+
#include <trace/misc/nfs.h>
16+
#include <trace/misc/sunrpc.h>
1717

1818
#define nfs_show_cache_validity(v) \
1919
__print_flags(v, "|", \

include/trace/events/rpcgss.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include <linux/tracepoint.h>
1515

16-
#include <trace/events/sunrpc_base.h>
16+
#include <trace/misc/sunrpc.h>
1717

1818
/**
1919
** GSS-API related trace events

include/trace/events/rpcrdma.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include <linux/tracepoint.h>
1616
#include <rdma/ib_cm.h>
1717

18-
#include <trace/events/rdma.h>
19-
#include <trace/events/sunrpc_base.h>
18+
#include <trace/misc/rdma.h>
19+
#include <trace/misc/sunrpc.h>
2020

2121
/**
2222
** Event classes

include/trace/events/sunrpc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <linux/net.h>
1515
#include <linux/tracepoint.h>
1616

17-
#include <trace/events/sunrpc_base.h>
17+
#include <trace/misc/sunrpc.h>
1818

1919
TRACE_DEFINE_ENUM(SOCK_STREAM);
2020
TRACE_DEFINE_ENUM(SOCK_DGRAM);
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)