From: Bobby Eshleman <[email protected]> vsock_sysctl_ops and its two callbacks are named for the sysctl tables they register, but the init callback already does more than that: it also initialises the per-namespace vsock state through vsock_net_init().
Rename them to vsock_pernet_ops, vsock_pernet_init and vsock_pernet_exit, so that later per-namespace work has somewhere to go that does not read as sysctl handling. No functional change. Signed-off-by: Bobby Eshleman <[email protected]> --- Changes in v2: - New patch --- net/vmw_vsock/af_vsock.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 8d6b705f8640..95a435aef512 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -2998,7 +2998,7 @@ static void vsock_net_init(struct net *net) net->vsock.g2h_fallback = 1; } -static __net_init int vsock_sysctl_init_net(struct net *net) +static __net_init int vsock_pernet_init(struct net *net) { vsock_net_init(net); @@ -3008,14 +3008,14 @@ static __net_init int vsock_sysctl_init_net(struct net *net) return 0; } -static __net_exit void vsock_sysctl_exit_net(struct net *net) +static __net_exit void vsock_pernet_exit(struct net *net) { vsock_sysctl_unregister(net); } -static struct pernet_operations vsock_sysctl_ops = { - .init = vsock_sysctl_init_net, - .exit = vsock_sysctl_exit_net, +static struct pernet_operations vsock_pernet_ops = { + .init = vsock_pernet_init, + .exit = vsock_pernet_exit, }; static int __init vsock_init(void) @@ -3045,7 +3045,7 @@ static int __init vsock_init(void) goto err_unregister_proto; } - if (register_pernet_subsys(&vsock_sysctl_ops)) { + if (register_pernet_subsys(&vsock_pernet_ops)) { err = -ENOMEM; goto err_unregister_sock; } @@ -3069,7 +3069,7 @@ static void __exit vsock_exit(void) misc_deregister(&vsock_device); sock_unregister(AF_VSOCK); proto_unregister(&vsock_proto); - unregister_pernet_subsys(&vsock_sysctl_ops); + unregister_pernet_subsys(&vsock_pernet_ops); } const struct vsock_transport *vsock_core_get_transport(struct vsock_sock *vsk) -- 2.53.0-Meta
