diff options
| author | Christian Brauner <brauner@kernel.org> | 2025-09-22 14:47:25 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-09-22 14:47:25 +0200 |
| commit | d969328c513c6679b4be11a995ffd4d184c25b34 (patch) | |
| tree | 9d38639cdb55dfb9753dcf2c167222dcc6063643 /net/core/net_namespace.c | |
| parent | 7cf730321132e726ff949c6f3c0d5c598788f7a2 (diff) | |
| parent | 5890f504ef543190beae2a4e244bbfa7c3e0b57c (diff) | |
Merge patch series "ns: minor tweaks"
Christian Brauner <brauner@kernel.org> says:
* Add a missing include into the cgroup namespace header.
* Simplify ns_common_init{_inum}() and derive the namespace operations
from the namespace type.
* Add debug asserts into ns_common_init{_inum}() to catch bugs.
* patches from https://lore.kernel.org/20250922-work-namespace-ns_common-fixes-v1-0-3c26aeb30831@kernel.org:
ns: add ns_debug()
ns: simplify ns_common_init() further
cgroup: add missing ns_common include
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'net/core/net_namespace.c')
| -rw-r--r-- | net/core/net_namespace.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index d5e3fd819163..bdea7d5fac56 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -400,16 +400,9 @@ static __net_init void preinit_net_sysctl(struct net *net) /* init code that must occur even if setup_net() is not called. */ static __net_init int preinit_net(struct net *net, struct user_namespace *user_ns) { - const struct proc_ns_operations *ns_ops; int ret; -#ifdef CONFIG_NET_NS - ns_ops = &netns_operations; -#else - ns_ops = NULL; -#endif - - ret = ns_common_init(net, ns_ops); + ret = ns_common_init(net); if (ret) return ret; |