sctp: get netns from asoc and ep base
Commit 312434617c
("sctp: cache netns in sctp_ep_common") set netns
in asoc and ep base since they're created, and it will never change.
It's a better way to get netns from asoc and ep base, comparing to
calling sock_net().
This patch is to replace them.
v1->v2:
- no change.
Suggested-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
26c97a2d82
commit
4e7696d90b
@@ -244,7 +244,7 @@ struct sctp_endpoint *sctp_endpoint_is_match(struct sctp_endpoint *ep,
|
||||
struct sctp_endpoint *retval = NULL;
|
||||
|
||||
if ((htons(ep->base.bind_addr.port) == laddr->v4.sin_port) &&
|
||||
net_eq(sock_net(ep->base.sk), net)) {
|
||||
net_eq(ep->base.net, net)) {
|
||||
if (sctp_bind_addr_match(&ep->base.bind_addr, laddr,
|
||||
sctp_sk(ep->base.sk)))
|
||||
retval = ep;
|
||||
@@ -292,8 +292,8 @@ bool sctp_endpoint_is_peeled_off(struct sctp_endpoint *ep,
|
||||
const union sctp_addr *paddr)
|
||||
{
|
||||
struct sctp_sockaddr_entry *addr;
|
||||
struct net *net = ep->base.net;
|
||||
struct sctp_bind_addr *bp;
|
||||
struct net *net = sock_net(ep->base.sk);
|
||||
|
||||
bp = &ep->base.bind_addr;
|
||||
/* This function is called with the socket lock held,
|
||||
@@ -384,7 +384,7 @@ normal:
|
||||
if (asoc && sctp_chunk_is_data(chunk))
|
||||
asoc->peer.last_data_from = chunk->transport;
|
||||
else {
|
||||
SCTP_INC_STATS(sock_net(ep->base.sk), SCTP_MIB_INCTRLCHUNKS);
|
||||
SCTP_INC_STATS(ep->base.net, SCTP_MIB_INCTRLCHUNKS);
|
||||
if (asoc)
|
||||
asoc->stats.ictrlchunks++;
|
||||
}
|
||||
|
Reference in New Issue
Block a user