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

xprtrdma: Prepare RPC/RDMA includes for server-side trace points

Clean up: Move #include <trace/events/rpcrdma.h> into source files,
similar to how it is done with trace/events/sunrpc.h.

Server-side trace points will be part of the rpcrdma subsystem,
just like the client-side trace points.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

authored by

Chuck Lever and committed by
J. Bruce Fields b6e717cb 8dafcbee

+12 -6
+1
net/sunrpc/xprtrdma/backchannel.c
··· 11 11 #include <linux/sunrpc/svc_xprt.h> 12 12 13 13 #include "xprt_rdma.h" 14 + #include <trace/events/rpcrdma.h> 14 15 15 16 #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) 16 17 # define RPCDBG_FACILITY RPCDBG_TRANS
+1
net/sunrpc/xprtrdma/fmr_ops.c
··· 21 21 */ 22 22 23 23 #include "xprt_rdma.h" 24 + #include <trace/events/rpcrdma.h> 24 25 25 26 #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) 26 27 # define RPCDBG_FACILITY RPCDBG_TRANS
+1
net/sunrpc/xprtrdma/frwr_ops.c
··· 73 73 #include <linux/sunrpc/rpc_rdma.h> 74 74 75 75 #include "xprt_rdma.h" 76 + #include <trace/events/rpcrdma.h> 76 77 77 78 #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) 78 79 # define RPCDBG_FACILITY RPCDBG_TRANS
+3 -1
net/sunrpc/xprtrdma/module.c
··· 13 13 14 14 #include <asm/swab.h> 15 15 16 - #define CREATE_TRACE_POINTS 17 16 #include "xprt_rdma.h" 17 + 18 + #define CREATE_TRACE_POINTS 19 + #include <trace/events/rpcrdma.h> 18 20 19 21 MODULE_AUTHOR("Open Grid Computing and Network Appliance, Inc."); 20 22 MODULE_DESCRIPTION("RPC/RDMA Transport");
+3 -2
net/sunrpc/xprtrdma/rpc_rdma.c
··· 46 46 * to the Linux RPC framework lives. 47 47 */ 48 48 49 - #include "xprt_rdma.h" 50 - 51 49 #include <linux/highmem.h> 50 + 51 + #include "xprt_rdma.h" 52 + #include <trace/events/rpcrdma.h> 52 53 53 54 #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) 54 55 # define RPCDBG_FACILITY RPCDBG_TRANS
+1 -1
net/sunrpc/xprtrdma/svc_rdma.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause 2 2 /* 3 + * Copyright (c) 2015-2018 Oracle. All rights reserved. 3 4 * Copyright (c) 2005-2006 Network Appliance, Inc. All rights reserved. 4 5 * 5 6 * This software is available to you under a choice of one of two ··· 48 47 #include <linux/sunrpc/clnt.h> 49 48 #include <linux/sunrpc/sched.h> 50 49 #include <linux/sunrpc/svc_rdma.h> 51 - #include "xprt_rdma.h" 52 50 53 51 #define RPCDBG_FACILITY RPCDBG_SVCXPRT 54 52
+1
net/sunrpc/xprtrdma/transport.c
··· 54 54 #include <linux/sunrpc/addr.h> 55 55 56 56 #include "xprt_rdma.h" 57 + #include <trace/events/rpcrdma.h> 57 58 58 59 #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) 59 60 # define RPCDBG_FACILITY RPCDBG_TRANS
+1
net/sunrpc/xprtrdma/verbs.c
··· 59 59 #include <rdma/ib_cm.h> 60 60 61 61 #include "xprt_rdma.h" 62 + #include <trace/events/rpcrdma.h> 62 63 63 64 /* 64 65 * Globals/Macros
-2
net/sunrpc/xprtrdma/xprt_rdma.h
··· 675 675 extern struct xprt_class xprt_rdma_bc; 676 676 677 677 #endif /* _LINUX_SUNRPC_XPRT_RDMA_H */ 678 - 679 - #include <trace/events/rpcrdma.h>