Skip to content

Commit e1fec5f

Browse files
chuckleversmb49
authored andcommitted
trace: Relocate event helper files
BugLink: https://bugs.launchpad.net/bugs/2065435 [ Upstream commit 247c01f ] 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]> Stable-dep-of: 638593b ("NFSD: add CB_RECALL_ANY tracepoints") Signed-off-by: Chuck Lever <[email protected]> Signed-off-by: Manuel Diewald <[email protected]> Signed-off-by: Roxana Nicolescu <[email protected]>
1 parent 6c0cda2 commit e1fec5f

File tree

12 files changed

+19
-12
lines changed

12 files changed

+19
-12
lines changed

MAINTAINERS

+7
Original file line numberDiff line numberDiff line change
@@ -9242,6 +9242,7 @@ F: drivers/infiniband/
92429242
F: include/rdma/
92439243
F: include/trace/events/ib_mad.h
92449244
F: include/trace/events/ib_umad.h
9245+
F: include/trace/misc/rdma.h
92459246
F: include/uapi/linux/if_infiniband.h
92469247
F: include/uapi/rdma/
92479248
F: samples/bpf/ibumad_kern.c
@@ -10223,6 +10224,12 @@ F: fs/nfs_common/
1022310224
F: fs/nfsd/
1022410225
F: include/linux/lockd/
1022510226
F: include/linux/sunrpc/
10227+
F: include/trace/events/rpcgss.h
10228+
F: include/trace/events/rpcrdma.h
10229+
F: include/trace/events/sunrpc.h
10230+
F: include/trace/misc/fs.h
10231+
F: include/trace/misc/nfs.h
10232+
F: include/trace/misc/sunrpc.h
1022610233
F: include/uapi/linux/nfsd/
1022710234
F: include/uapi/linux/sunrpc/
1022810235
F: net/sunrpc/

drivers/infiniband/core/cm_trace.h

+1-1
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

+1-1
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

+3-3
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

+3-3
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

+1-1
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

+2-2
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

+1-1
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.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)