Skip to content

Commit

Permalink
trace: Relocate event helper files
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Chuck Lever authored and Chuck Lever committed Dec 10, 2022
1 parent 79a1d88 commit 247c01f
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 12 deletions.
7 changes: 7 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -10055,6 +10055,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
Expand Down Expand Up @@ -11140,6 +11141,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/
Expand Down
2 changes: 1 addition & 1 deletion drivers/infiniband/core/cm_trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/infiniband/core/cma_trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions fs/nfs/nfs4trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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, "|", \
Expand Down
6 changes: 3 additions & 3 deletions fs/nfs/nfstrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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, "|", \
Expand Down
2 changes: 1 addition & 1 deletion include/trace/events/rpcgss.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include <linux/tracepoint.h>

#include <trace/events/sunrpc_base.h>
#include <trace/misc/sunrpc.h>

/**
** GSS-API related trace events
Expand Down
4 changes: 2 additions & 2 deletions include/trace/events/rpcrdma.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/trace/events/sunrpc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 247c01f

Please sign in to comment.