lkml.org 
[lkml]   [2019]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 31/32] Revert "tipc: fix modprobe tipc failed after switch order of device registration"
    Date
    From: David S. Miller <davem@davemloft.net>

    commit 5593530e56943182ebb6d81eca8a3be6db6dbba4 upstream.

    This reverts commit 532b0f7ece4cb2ffd24dc723ddf55242d1188e5e.

    More revisions coming up.

    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/tipc/core.c | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    --- a/net/tipc/core.c
    +++ b/net/tipc/core.c
    @@ -66,10 +66,6 @@ static int __net_init tipc_init_net(stru
    INIT_LIST_HEAD(&tn->node_list);
    spin_lock_init(&tn->node_list_lock);

    - err = tipc_socket_init();
    - if (err)
    - goto out_socket;
    -
    err = tipc_sk_rht_init(net);
    if (err)
    goto out_sk_rht;
    @@ -96,8 +92,6 @@ out_subscr:
    out_nametbl:
    tipc_sk_rht_destroy(net);
    out_sk_rht:
    - tipc_socket_stop();
    -out_socket:
    return err;
    }

    @@ -108,7 +102,6 @@ static void __net_exit tipc_exit_net(str
    tipc_bcast_stop(net);
    tipc_nametbl_stop(net);
    tipc_sk_rht_destroy(net);
    - tipc_socket_stop();
    }

    static struct pernet_operations tipc_net_ops = {
    @@ -144,6 +137,10 @@ static int __init tipc_init(void)
    if (err)
    goto out_pernet;

    + err = tipc_socket_init();
    + if (err)
    + goto out_socket;
    +
    err = tipc_bearer_setup();
    if (err)
    goto out_bearer;
    @@ -151,6 +148,8 @@ static int __init tipc_init(void)
    pr_info("Started in single node mode\n");
    return 0;
    out_bearer:
    + tipc_socket_stop();
    +out_socket:
    unregister_pernet_subsys(&tipc_net_ops);
    out_pernet:
    tipc_unregister_sysctl();
    @@ -166,6 +165,7 @@ out_netlink:
    static void __exit tipc_exit(void)
    {
    tipc_bearer_cleanup();
    + tipc_socket_stop();
    unregister_pernet_subsys(&tipc_net_ops);
    tipc_netlink_stop();
    tipc_netlink_compat_stop();

    \
     
     \ /
      Last update: 2019-06-03 11:11    [W:3.700 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site