net-sctp: replace some sock_net(sk) with just 'net'
Subsystems (3)
PATCH 1/1 net-sctp: replace some sock_net(sk) with just 'net'
From: Maciej Żenczykowski <[email protected]>
It already existed in part of the function, but move it to a higher level and use it consistently throughout.
Safe since sk is never written to.
--- net/sctp/socket.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/sctp/socket.c +6 -6
@@ -8264,6 +8264,7 @@ static struct sctp_bind_bucket *sctp_bucket_create(static int sctp_get_port_local (struct sock *sk,union sctp_addr *addr) { +struct net *net =sock_net (sk);struct sctp_sock *sp =sctp_sk (sk);bool reuse = (sk->sk_reuse || sp->reuse);struct sctp_bind_hashbucket *head;/* hash list */
@@ -8282,7 +8283,6 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)/* Search for an available port. */ int low, high, remaining, index;unsigned int rover; -struct net *net =sock_net (sk);inet_get_local_port_range (net, &low, &high); remaining = (high - low) +1 ;
@@ -8294,12 +8294,12 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr) rover = low;if (inet_is_local_reserved_port (net, rover))continue ; - index =sctp_phashfn (sock_net (sk), rover); + index =sctp_phashfn (net, rover); head = &sctp_port_hashtable[index];spin_lock (&head->lock);sctp_for_each_hentry (pp, &head->chain)if ((pp->port == rover) && -net_eq (sock_net (sk), pp->net)) +net_eq (net, pp->net)) goto next;break ; next:
@@ -8323,10 +8323,10 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)* to the port number (snum) - we detect that with the * port iterator, pp being NULL. */ - head = &sctp_port_hashtable[sctp_phashfn (sock_net (sk), snum)]; + head = &sctp_port_hashtable[sctp_phashfn (net, snum)];spin_lock (&head->lock);sctp_for_each_hentry (pp, &head->chain) { -if ((pp->port == snum) &&net_eq (pp->net,sock_net (sk))) +if ((pp->port == snum) &&net_eq (pp->net, net)) goto pp_found; } }
@@ -8382,7 +8382,7 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr) pp_not_found:/* If there was a hash table miss, create a new port. */ ret =1 ; -if (!pp && !(pp =sctp_bucket_create (head,sock_net (sk), snum))) +if (!pp && !(pp =sctp_bucket_create (head, net, snum))) goto fail_unlock;/* In either case (hit or miss), make sure fastreuse is 1 only
Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
David Miller
maintainerFrom: Maciej Żenczykowski <[email protected]>
Date: Sun, 24 Nov 2019 02:47:27 -0800
net/sctp/socket.c static struct sctp_bind_bucket *sctp_bucket_create( · line 8270
Quoted 8 lines
net/sctp/socket.c +1
-0@@ -8264,6 +8264,7 @@ static struct sctp_bind_bucket *sctp_bucket_create(static int sctp_get_port_local (struct sock *sk,union sctp_addr *addr) { +struct net *net =sock_net (sk);struct sctp_sock *sp =sctp_sk (sk);bool reuse = (sk->sk_reuse || sp->reuse);struct sctp_bind_hashbucket *head;/* hash list */
Please don't make the reverse christmas tree situation here worse, thank you.
PATCH v2 1/1 net-sctp: replace some sock_net(sk) with just 'net'
From: Maciej Żenczykowski <[email protected]>
It already existed in part of the function, but move it to a higher level and use it consistently throughout.
Safe since sk is never written to.
--- net/sctp/socket.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/sctp/socket.c +6 -6
@@ -8267,6 +8267,7 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)struct sctp_sock *sp =sctp_sk (sk);bool reuse = (sk->sk_reuse || sp->reuse);struct sctp_bind_hashbucket *head;/* hash list */ +struct net *net =sock_net (sk);kuid_t uid =sock_i_uid (sk);struct sctp_bind_bucket *pp;unsigned short snum;
@@ -8282,7 +8283,6 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)/* Search for an available port. */ int low, high, remaining, index;unsigned int rover; -struct net *net =sock_net (sk);inet_get_local_port_range (net, &low, &high); remaining = (high - low) +1 ;
@@ -8294,12 +8294,12 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr) rover = low;if (inet_is_local_reserved_port (net, rover))continue ; - index =sctp_phashfn (sock_net (sk), rover); + index =sctp_phashfn (net, rover); head = &sctp_port_hashtable[index];spin_lock (&head->lock);sctp_for_each_hentry (pp, &head->chain)if ((pp->port == rover) && -net_eq (sock_net (sk), pp->net)) +net_eq (net, pp->net)) goto next;break ; next:
@@ -8323,10 +8323,10 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)* to the port number (snum) - we detect that with the * port iterator, pp being NULL. */ - head = &sctp_port_hashtable[sctp_phashfn (sock_net (sk), snum)]; + head = &sctp_port_hashtable[sctp_phashfn (net, snum)];spin_lock (&head->lock);sctp_for_each_hentry (pp, &head->chain) { -if ((pp->port == snum) &&net_eq (pp->net,sock_net (sk))) +if ((pp->port == snum) &&net_eq (pp->net, net)) goto pp_found; } }
@@ -8382,7 +8382,7 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr) pp_not_found:/* If there was a hash table miss, create a new port. */ ret =1 ; -if (!pp && !(pp =sctp_bucket_create (head,sock_net (sk), snum))) +if (!pp && !(pp =sctp_bucket_create (head, net, snum))) goto fail_unlock;/* In either case (hit or miss), make sure fastreuse is 1 only
Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
Quoted 8 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
It already existed in part of the function, but move it to a higher level and use it consistently throughout.
Safe since sk is never written to.
Signed-off-by Maciej Żenczykowski <[email protected]>
Please Cc linux-sctp@ on sctp patches.
From: Maciej Żenczykowski <[email protected]>
Date: Mon, 25 Nov 2019 15:09:37 -0800
Quoted 8 lines
From: Maciej Żenczykowski <[email protected]>
It already existed in part of the function, but move it to a higher level and use it consistently throughout.
Safe since sk is never written to.
Signed-off-by Maciej Żenczykowski <[email protected]>
Applied.