| Message ID | 20250317-rpc-shutdown-v1-3-85ba8e20b75d@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | nfs/sunrpc: stop holding netns references in client-side NFS and RPC objects | expand |
diff --git a/fs/lockd/clnt4xdr.c b/fs/lockd/clnt4xdr.c index 527458db4525af3e76d9119feb6e5e5b62890741..d824c8f89aeedf5903052bf4ed045b079adadaa1 100644 --- a/fs/lockd/clnt4xdr.c +++ b/fs/lockd/clnt4xdr.c @@ -14,6 +14,7 @@ #include <linux/sunrpc/clnt.h> #include <linux/sunrpc/stats.h> #include <linux/lockd/lockd.h> +#include <linux/lockd/debug.h> #include <uapi/linux/nfs3.h> diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c index a7e0519ec024a9f73ca05d0d4a0ca29f22d0eb23..5f593d367c1f1781cf68842bb00610234c436524 100644 --- a/fs/lockd/clntlock.c +++ b/fs/lockd/clntlock.c @@ -16,6 +16,7 @@ #include <linux/sunrpc/svc.h> #include <linux/sunrpc/svc_xprt.h> #include <linux/lockd/lockd.h> +#include <linux/lockd/debug.h> #include <linux/kthread.h> #include "trace.h" diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c index cebcc283b7ce2e813944d9037de2a7462585a2c9..2cc331c8b2a294f4feae38d1ca0da240b14008bc 100644 --- a/fs/lockd/clntproc.c +++ b/fs/lockd/clntproc.c @@ -19,6 +19,7 @@ #include <linux/sunrpc/clnt.h> #include <linux/sunrpc/svc.h> #include <linux/lockd/lockd.h> +#include <linux/lockd/debug.h> #include "trace.h" diff --git a/fs/lockd/clntxdr.c b/fs/lockd/clntxdr.c index 6ea3448d2d31ea54451d6ec0fd01c5f31c35e123..effcef151b60a929a8e96d5560aa5efa84e00b74 100644 --- a/fs/lockd/clntxdr.c +++ b/fs/lockd/clntxdr.c @@ -16,6 +16,7 @@ #include <linux/sunrpc/clnt.h> #include <linux/sunrpc/stats.h> #include <linux/lockd/lockd.h> +#include <linux/lockd/debug.h> #include <uapi/linux/nfs2.h> diff --git a/fs/lockd/host.c b/fs/lockd/host.c index ed88c102eca0f999a9c5351467d823b806c30962..931a24abd78462ae12b18b7799e1c060748ff276 100644 --- a/fs/lockd/host.c +++ b/fs/lockd/host.c @@ -17,6 +17,7 @@ #include <linux/sunrpc/addr.h> #include <linux/sunrpc/svc.h> #include <linux/lockd/lockd.h> +#include <linux/lockd/debug.h> #include <linux/mutex.h> #include <linux/sunrpc/svc_xprt.h> diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index b8fc732e1c677063a0d0a1385a64ce22fe216ae4..79364ffa7b2f2aa43c1a504b59d2de77691ae378 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c @@ -17,6 +17,7 @@ #include <linux/sunrpc/xprtsock.h> #include <linux/sunrpc/svc.h> #include <linux/lockd/lockd.h> +#include <linux/lockd/debug.h> #include <linux/unaligned.h> diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 2c8eedc6c2cc9ebcfe521d90364de84e00eae40f..1cd1bdb06566c70c77728e9a3bab19364c155cdc 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -37,6 +37,7 @@ #include <net/addrconf.h> #include <net/ipv6.h> #include <linux/lockd/lockd.h> +#include <linux/lockd/debug.h> #include <linux/nfs.h> #include "netns.h" diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c index 109e5caae8c7045487d32bf35b5b80456a421f57..6fdaac8e6877f148927bdc9c0ba613de2dbf2be0 100644 --- a/fs/lockd/svc4proc.c +++ b/fs/lockd/svc4proc.c @@ -11,6 +11,7 @@ #include <linux/types.h> #include <linux/time.h> #include <linux/lockd/lockd.h> +#include <linux/lockd/debug.h> #include <linux/lockd/share.h> #include <linux/sunrpc/svc_xprt.h> diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index c1315df4b350bbd753305b5c08550d50f67b92aa..d73ba3959aac3160904b55e77cc10d59604b725c 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -30,6 +30,7 @@ #include <linux/sunrpc/svc_xprt.h> #include <linux/lockd/nlm.h> #include <linux/lockd/lockd.h> +#include <linux/lockd/debug.h> #define NLMDBG_FACILITY NLMDBG_SVCLOCK diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index f53d5177f26732092242fcabe32f0f8931fc1fb6..68c08bf21d300a1c5739c659ceffe375b465c16b 100644 --- a/fs/lockd/svcproc.c +++ b/fs/lockd/svcproc.c @@ -11,6 +11,7 @@ #include <linux/types.h> #include <linux/time.h> #include <linux/lockd/lockd.h> +#include <linux/lockd/debug.h> #include <linux/lockd/share.h> #include <linux/sunrpc/svc_xprt.h> diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c index 9103896164f6886eec5adf65a55f4c29433dcb29..e3b63708f7872d5a97df0d1379db40b2fbd3ac5d 100644 --- a/fs/lockd/svcsubs.c +++ b/fs/lockd/svcsubs.c @@ -16,6 +16,7 @@ #include <linux/sunrpc/svc.h> #include <linux/sunrpc/addr.h> #include <linux/lockd/lockd.h> +#include <linux/lockd/debug.h> #include <linux/lockd/share.h> #include <linux/module.h> #include <linux/mount.h> diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index 6b8c912f443c3b4130f49b8170070d0b794abb94..21cd2cd85e537708ac83d658e40265cec327197b 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h @@ -24,7 +24,6 @@ #ifdef CONFIG_LOCKD_V4 #include <linux/lockd/xdr4.h> #endif -#include <linux/lockd/debug.h> #include <linux/sunrpc/svc.h> /*
We need to #include lockd.h in some files in fs/nfs, but the dprintk definitions collide with the ones in NFS. Include it directly in the files in fs/lockd/ that need it. Signed-off-by: Jeff Layton <jlayton@kernel.org> --- fs/lockd/clnt4xdr.c | 1 + fs/lockd/clntlock.c | 1 + fs/lockd/clntproc.c | 1 + fs/lockd/clntxdr.c | 1 + fs/lockd/host.c | 1 + fs/lockd/mon.c | 1 + fs/lockd/svc.c | 1 + fs/lockd/svc4proc.c | 1 + fs/lockd/svclock.c | 1 + fs/lockd/svcproc.c | 1 + fs/lockd/svcsubs.c | 1 + include/linux/lockd/lockd.h | 1 - 12 files changed, 11 insertions(+), 1 deletion(-)