Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
lockd: Relocate include/linux/lockd/lockd.h
Headers placed in include/linux/ form part of the kernel's
internal API and signal to subsystem maintainers that other
parts of the kernel may depend on them. By moving lockd.h
into fs/lockd/, lockd becomes a more self-contained module
whose internal interfaces are clearly distinguished from its
public contract with the rest of the kernel. This relocation
addresses a long-standing XXX comment in the header itself
that acknowledged the file's misplacement. Future changes to
lockd internals can now proceed with confidence that external
consumers are not inadvertently coupled to implementation
details.
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
+22
-25
+2
-1
fs/lockd/clnt4xdr.c
+2
-1
fs/lockd/clnt4xdr.c
+1
-1
fs/lockd/clntlock.c
+1
-1
fs/lockd/clntlock.c
+1
-1
fs/lockd/clntproc.c
+1
-1
fs/lockd/clntproc.c
+2
-1
fs/lockd/clntxdr.c
+2
-1
fs/lockd/clntxdr.c
+1
-1
fs/lockd/host.c
+1
-1
fs/lockd/host.c
···
16
16
#include <linux/sunrpc/clnt.h>
17
17
#include <linux/sunrpc/addr.h>
18
18
#include <linux/sunrpc/svc.h>
19
-
#include <linux/lockd/lockd.h>
20
19
#include <linux/mutex.h>
21
20
22
21
#include <linux/sunrpc/svc_xprt.h>
23
22
24
23
#include <net/ipv6.h>
25
24
25
+
#include "lockd.h"
26
26
#include "netns.h"
27
27
28
28
#define NLMDBG_FACILITY NLMDBG_HOSTCACHE
+1
-1
fs/lockd/mon.c
+1
-1
fs/lockd/mon.c
···
16
16
#include <linux/sunrpc/addr.h>
17
17
#include <linux/sunrpc/xprtsock.h>
18
18
#include <linux/sunrpc/svc.h>
19
-
#include <linux/lockd/lockd.h>
20
19
21
20
#include <linux/unaligned.h>
22
21
22
+
#include "lockd.h"
23
23
#include "netns.h"
24
24
25
25
#define NLMDBG_FACILITY NLMDBG_MONITOR
+1
-1
fs/lockd/svc.c
+1
-1
fs/lockd/svc.c
+1
-1
fs/lockd/svc4proc.c
+1
-1
fs/lockd/svc4proc.c
+2
-1
fs/lockd/svclock.c
+2
-1
fs/lockd/svclock.c
+1
-1
fs/lockd/svcproc.c
+1
-1
fs/lockd/svcproc.c
+1
-1
fs/lockd/svcsubs.c
+1
-1
fs/lockd/svcsubs.c
···
15
15
#include <linux/mutex.h>
16
16
#include <linux/sunrpc/svc.h>
17
17
#include <linux/sunrpc/addr.h>
18
-
#include <linux/lockd/lockd.h>
19
18
#include <linux/module.h>
20
19
#include <linux/mount.h>
21
20
#include <uapi/linux/nfs2.h>
22
21
22
+
#include "lockd.h"
23
23
#include "share.h"
24
24
25
25
#define NLMDBG_FACILITY NLMDBG_SVCSUBS
+2
-1
fs/lockd/trace.h
+2
-1
fs/lockd/trace.h
+1
-2
fs/lockd/xdr.c
+1
-2
fs/lockd/xdr.c
···
15
15
#include <linux/sunrpc/clnt.h>
16
16
#include <linux/sunrpc/svc.h>
17
17
#include <linux/sunrpc/stats.h>
18
-
#include <linux/lockd/lockd.h>
19
18
20
19
#include <uapi/linux/nfs2.h>
21
20
21
+
#include "lockd.h"
22
22
#include "svcxdr.h"
23
-
24
23
25
24
static inline loff_t
26
25
s32_to_loff_t(__s32 offset)
+1
-1
fs/lockd/xdr4.c
+1
-1
fs/lockd/xdr4.c
+3
-9
include/linux/lockd/lockd.h
fs/lockd/lockd.h
+3
-9
include/linux/lockd/lockd.h
fs/lockd/lockd.h
···
1
1
/* SPDX-License-Identifier: GPL-2.0 */
2
2
/*
3
-
* linux/include/linux/lockd/lockd.h
4
-
*
5
-
* General-purpose lockd include file.
6
-
*
7
3
* Copyright (C) 1996 Olaf Kirch <okir@monad.swb.de>
8
4
*/
9
5
10
-
#ifndef LINUX_LOCKD_LOCKD_H
11
-
#define LINUX_LOCKD_LOCKD_H
12
-
13
-
/* XXX: a lot of this should really be under fs/lockd. */
6
+
#ifndef _LOCKD_LOCKD_H
7
+
#define _LOCKD_LOCKD_H
14
8
15
9
#include <linux/exportfs.h>
16
10
#include <linux/in.h>
···
392
398
393
399
extern const struct lock_manager_operations nlmsvc_lock_operations;
394
400
395
-
#endif /* LINUX_LOCKD_LOCKD_H */
401
+
#endif /* _LOCKD_LOCKD_H */