Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <chuck.lever@oracle.com>
Acked-by: Leon Romanovsky <leonro@nvidia.com>
Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Acked-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

authored by

Chuck Lever and committed by
Chuck Lever
247c01ff 79a1d88a

+19 -12
+7
MAINTAINERS
··· 10055 10055 F: include/rdma/ 10056 10056 F: include/trace/events/ib_mad.h 10057 10057 F: include/trace/events/ib_umad.h 10058 + F: include/trace/misc/rdma.h 10058 10059 F: include/uapi/linux/if_infiniband.h 10059 10060 F: include/uapi/rdma/ 10060 10061 F: samples/bpf/ibumad_kern.c ··· 11141 11140 F: fs/nfsd/ 11142 11141 F: include/linux/lockd/ 11143 11142 F: include/linux/sunrpc/ 11143 + F: include/trace/events/rpcgss.h 11144 + F: include/trace/events/rpcrdma.h 11145 + F: include/trace/events/sunrpc.h 11146 + F: include/trace/misc/fs.h 11147 + F: include/trace/misc/nfs.h 11148 + F: include/trace/misc/sunrpc.h 11144 11149 F: include/uapi/linux/nfsd/ 11145 11150 F: include/uapi/linux/sunrpc/ 11146 11151 F: net/sunrpc/
+1 -1
drivers/infiniband/core/cm_trace.h
··· 16 16 17 17 #include <linux/tracepoint.h> 18 18 #include <rdma/ib_cm.h> 19 - #include <trace/events/rdma.h> 19 + #include <trace/misc/rdma.h> 20 20 21 21 /* 22 22 * enum ib_cm_state, from include/rdma/ib_cm.h
+1 -1
drivers/infiniband/core/cma_trace.h
··· 15 15 #define _TRACE_RDMA_CMA_H 16 16 17 17 #include <linux/tracepoint.h> 18 - #include <trace/events/rdma.h> 18 + #include <trace/misc/rdma.h> 19 19 20 20 21 21 DECLARE_EVENT_CLASS(cma_fsm_class,
+3 -3
fs/nfs/nfs4trace.h
··· 9 9 #define _TRACE_NFS4_H 10 10 11 11 #include <linux/tracepoint.h> 12 - #include <trace/events/sunrpc_base.h> 12 + #include <trace/misc/sunrpc.h> 13 13 14 - #include <trace/events/fs.h> 15 - #include <trace/events/nfs.h> 14 + #include <trace/misc/fs.h> 15 + #include <trace/misc/nfs.h> 16 16 17 17 #define show_nfs_fattr_flags(valid) \ 18 18 __print_flags((unsigned long)valid, "|", \
+3 -3
fs/nfs/nfstrace.h
··· 11 11 #include <linux/tracepoint.h> 12 12 #include <linux/iversion.h> 13 13 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> 17 17 18 18 #define nfs_show_cache_validity(v) \ 19 19 __print_flags(v, "|", \
include/trace/events/fs.h include/trace/misc/fs.h
include/trace/events/nfs.h include/trace/misc/nfs.h
include/trace/events/rdma.h include/trace/misc/rdma.h
+1 -1
include/trace/events/rpcgss.h
··· 13 13 14 14 #include <linux/tracepoint.h> 15 15 16 - #include <trace/events/sunrpc_base.h> 16 + #include <trace/misc/sunrpc.h> 17 17 18 18 /** 19 19 ** GSS-API related trace events
+2 -2
include/trace/events/rpcrdma.h
··· 15 15 #include <linux/tracepoint.h> 16 16 #include <rdma/ib_cm.h> 17 17 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> 20 20 21 21 /** 22 22 ** Event classes
+1 -1
include/trace/events/sunrpc.h
··· 14 14 #include <linux/net.h> 15 15 #include <linux/tracepoint.h> 16 16 17 - #include <trace/events/sunrpc_base.h> 17 + #include <trace/misc/sunrpc.h> 18 18 19 19 TRACE_DEFINE_ENUM(SOCK_STREAM); 20 20 TRACE_DEFINE_ENUM(SOCK_DGRAM);
include/trace/events/sunrpc_base.h include/trace/misc/sunrpc.h