OSDN Git Service

mptcp: remove redundant initialization in pm_nl_init_net()
authorJianguo Wu <wujianguo@chinatelecom.cn>
Thu, 27 May 2021 23:54:27 +0000 (16:54 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 28 May 2021 20:59:16 +0000 (13:59 -0700)
Memory of struct pm_nl_pernet{} is allocated by kzalloc()
in setup_net()->ops_init(), so it's no need to reset counters
and zero bitmap in pm_nl_init_net().

Acked-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Jianguo Wu <wujianguo@chinatelecom.cn>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/mptcp/pm_netlink.c

index 2469e06..7dbc4f3 100644 (file)
@@ -1913,10 +1913,13 @@ static int __net_init pm_nl_init_net(struct net *net)
        struct pm_nl_pernet *pernet = net_generic(net, pm_nl_pernet_id);
 
        INIT_LIST_HEAD_RCU(&pernet->local_addr_list);
-       __reset_counters(pernet);
        pernet->next_id = 1;
-       bitmap_zero(pernet->id_bitmap, MAX_ADDR_ID + 1);
        spin_lock_init(&pernet->lock);
+
+       /* No need to initialize other pernet fields, the struct is zeroed at
+        * allocation time.
+        */
+
        return 0;
 }