lkml.org 
[lkml]   [2018]   [Jan]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 44/63] sctp: Replace use of sockets_allocated with specified macro.
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Tonghao Zhang <xiangxia.m.yue@gmail.com>


    [ Upstream commit 8cb38a602478e9f806571f6920b0a3298aabf042 ]

    The patch(180d8cd942ce) replaces all uses of struct sock fields'
    memory_pressure, memory_allocated, sockets_allocated, and sysctl_mem
    to accessor macros. But the sockets_allocated field of sctp sock is
    not replaced at all. Then replace it now for unifying the code.

    Fixes: 180d8cd942ce ("foundations of per-cgroup memory pressure controlling.")
    Cc: Glauber Costa <glommer@parallels.com>
    Signed-off-by: Tonghao Zhang <zhangtonghao@didichuxing.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/sctp/socket.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/net/sctp/socket.c
    +++ b/net/sctp/socket.c
    @@ -4153,7 +4153,7 @@ static int sctp_init_sock(struct sock *s
    SCTP_DBG_OBJCNT_INC(sock);

    local_bh_disable();
    - percpu_counter_inc(&sctp_sockets_allocated);
    + sk_sockets_allocated_inc(sk);
    sock_prot_inuse_add(net, sk->sk_prot, 1);

    /* Nothing can fail after this block, otherwise
    @@ -4197,7 +4197,7 @@ static void sctp_destroy_sock(struct soc
    }
    sctp_endpoint_free(sp->ep);
    local_bh_disable();
    - percpu_counter_dec(&sctp_sockets_allocated);
    + sk_sockets_allocated_dec(sk);
    sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
    local_bh_enable();
    }

    \
     
     \ /
      Last update: 2018-01-01 16:26    [W:3.028 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site