Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 986444ea authored by Tonghao Zhang's avatar Tonghao Zhang Committed by Greg Kroah-Hartman
Browse files

sctp: Replace use of sockets_allocated with specified macro. 




[ Upstream commit 8cb38a602478e9f806571f6920b0a3298aabf042 ]

The patch(180d8cd9) 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: 180d8cd9 ("foundations of per-cgroup memory pressure controlling.")
Cc: Glauber Costa <glommer@parallels.com>
Signed-off-by: default avatarTonghao Zhang <zhangtonghao@didichuxing.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a11d92b0

net/sctp/socket.c

+2 −2
Original line number Diff line number Diff line
@@ -4166,7 +4166,7 @@ static int sctp_init_sock(struct sock *sk) 
	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
@@ -4210,7 +4210,7 @@ static void sctp_destroy_sock(struct sock *sk) 
	}

	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();

}