trace: Relocate event helper files

[ Upstream commit 247c01ff5f8d66e62a404c91733be52fecb8b7f6 ]

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>
Stable-dep-of: 638593be55c0 ("NFSD: add CB_RECALL_ANY tracepoints")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 9216b9c85ce92fbcbb65767ddb32291ee6faaf03..6bfc75861c8c0666828c853ab4e426918efcceec 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9200,6 +9200,7 @@ F:        drivers/infiniband/
 F:     include/rdma/
 F:     include/trace/events/ib_mad.h
 F:     include/trace/events/ib_umad.h
+F:     include/trace/misc/rdma.h
 F:     include/uapi/linux/if_infiniband.h
 F:     include/uapi/rdma/
 F:     samples/bpf/ibumad_kern.c
@@ -10181,6 +10182,12 @@ F:     fs/nfs_common/
 F:     fs/nfsd/
 F:     include/linux/lockd/
 F:     include/linux/sunrpc/
+F:     include/trace/events/rpcgss.h
+F:     include/trace/events/rpcrdma.h
+F:     include/trace/events/sunrpc.h
+F:     include/trace/misc/fs.h
+F:     include/trace/misc/nfs.h
+F:     include/trace/misc/sunrpc.h
 F:     include/uapi/linux/nfsd/
 F:     include/uapi/linux/sunrpc/
 F:     net/sunrpc/

diff --git a/drivers/infiniband/core/cm_trace.h b/drivers/infiniband/core/cm_trace.h
index e9d282679ef15542e05f32a7867c018edcd38a65..944d9071245d26bc4ef4fae0fdd242e14e095770 100644 (file)
--- a/drivers/infiniband/core/cm_trace.h
+++ b/drivers/infiniband/core/cm_trace.h
@@ -16,7 +16,7 @@
 
 #include <linux/tracepoint.h>
 #include <rdma/ib_cm.h>
-#include <trace/events/rdma.h>
+#include <trace/misc/rdma.h>
 
 /*
  * enum ib_cm_state, from include/rdma/ib_cm.h

diff --git a/drivers/infiniband/core/cma_trace.h b/drivers/infiniband/core/cma_trace.h
index e45264267bcc99f6929662bf3793ef52b055406d..47f3c6e4be8932affcd57d2e7e83fb0a97ec1e1c 100644 (file)
--- a/drivers/infiniband/core/cma_trace.h
+++ b/drivers/infiniband/core/cma_trace.h
@@ -15,7 +15,7 @@
 #define _TRACE_RDMA_CMA_H
 
 #include <linux/tracepoint.h>
-#include <trace/events/rdma.h>
+#include <trace/misc/rdma.h>
 
 
 DECLARE_EVENT_CLASS(cma_fsm_class,

diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
index 635f13a8d44aab144be8d5211bc4ca5b24d0e43d..8565fa654f59a18d795ce5e8513e2a98c806b2b5 100644 (file)
--- a/fs/nfs/nfs4trace.h
+++ b/fs/nfs/nfs4trace.h
@@ -9,10 +9,10 @@
 #define _TRACE_NFS4_H
 
 #include <linux/tracepoint.h>
-#include <trace/events/sunrpc_base.h>
+#include <trace/misc/sunrpc.h>
 
-#include <trace/events/fs.h>
-#include <trace/events/nfs.h>
+#include <trace/misc/fs.h>
+#include <trace/misc/nfs.h>
 
 #define show_nfs_fattr_flags(valid) \
        __print_flags((unsigned long)valid, "|", \

diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h
index f6013d3b110b8ae4d9fd0b45961615afb756d480..6804ca2efbf99754a47e87f508c8c1f1a1a7ba9c 100644 (file)
--- a/fs/nfs/nfstrace.h
+++ b/fs/nfs/nfstrace.h
@@ -11,9 +11,9 @@
 #include <linux/tracepoint.h>
 #include <linux/iversion.h>
 
-#include <trace/events/fs.h>
-#include <trace/events/nfs.h>
-#include <trace/events/sunrpc_base.h>
+#include <trace/misc/fs.h>
+#include <trace/misc/nfs.h>
+#include <trace/misc/sunrpc.h>
 
 #define nfs_show_cache_validity(v) \
        __print_flags(v, "|", \

diff --git a/include/trace/events/rpcgss.h b/include/trace/events/rpcgss.h
index 3ba63319af3cd7afc19d12cfeb36550ce0e33ad0..b8fd13303ee7eab9ca97488fbe7bd3f914faa7e4 100644 (file)
--- a/include/trace/events/rpcgss.h
+++ b/include/trace/events/rpcgss.h
@@ -13,7 +13,7 @@
 
 #include <linux/tracepoint.h>
 
-#include <trace/events/sunrpc_base.h>
+#include <trace/misc/sunrpc.h>
 
 /**
  ** GSS-API related trace events

diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdma.h
index 28ea73bba4e7852a3e596157b1f7034c9b663da1..513c09774e4f31264a42ace56e01327c6f3946f5 100644 (file)
--- a/include/trace/events/rpcrdma.h
+++ b/include/trace/events/rpcrdma.h
@@ -15,8 +15,8 @@
 #include <linux/tracepoint.h>
 #include <rdma/ib_cm.h>
 
-#include <trace/events/rdma.h>
-#include <trace/events/sunrpc_base.h>
+#include <trace/misc/rdma.h>
+#include <trace/misc/sunrpc.h>
 
 /**
  ** Event classes

diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index 68ae89c9a1c20ca5f12989103359e45b98d17716..e8eb83315f4f26f26d8e18abf08da9065f7bebdb 100644 (file)
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -14,7 +14,7 @@
 #include <linux/net.h>
 #include <linux/tracepoint.h>
 
-#include <trace/events/sunrpc_base.h>
+#include <trace/misc/sunrpc.h>
 
 TRACE_DEFINE_ENUM(SOCK_STREAM);
 TRACE_DEFINE_ENUM(SOCK_DGRAM);

diff --git a/include/trace/events/fs.h b/include/trace/misc/fs.h
similarity index 100%
rename from include/trace/events/fs.h
rename to include/trace/misc/fs.h

diff --git a/include/trace/events/nfs.h b/include/trace/misc/nfs.h
similarity index 100%
rename from include/trace/events/nfs.h
rename to include/trace/misc/nfs.h

diff --git a/include/trace/events/rdma.h b/include/trace/misc/rdma.h
similarity index 100%
rename from include/trace/events/rdma.h
rename to include/trace/misc/rdma.h

diff --git a/include/trace/events/sunrpc_base.h b/include/trace/misc/sunrpc.h
similarity index 100%
rename from include/trace/events/sunrpc_base.h
rename to include/trace/misc/sunrpc.h