diff mbox series

net-sctp: replace some sock_net(sk) with just 'net'

Message ID 20191124104727.8273-1-zenczykowski@gmail.com
State Changes Requested
Delegated to: David Miller
Headers show
Series net-sctp: replace some sock_net(sk) with just 'net' | expand

Commit Message

Maciej Żenczykowski Nov. 24, 2019, 10:47 a.m. UTC 
From: Maciej Żenczykowski <maze@google.com>

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 <maze@google.com>
---
 net/sctp/socket.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

David Miller Nov. 25, 2019, 6:50 p.m. UTC | #1 
From: Maciej Żenczykowski <zenczykowski@gmail.com>
Date: Sun, 24 Nov 2019 02:47:27 -0800

> @@ -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.
diff mbox series

Patch

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 83e4ca1fabda..f57a83d54583 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -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