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

Commit 489ce5f4 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by David S. Miller
Browse files

sctp: consolidate local_bh_disable/enable + spin_lock/unlock to _bh variant 



local_bh_disable() + spin_lock() is equivalent to spin_lock_bh(), same for
the unlock/enable case, so replace the calls by the appropriate wrappers.

Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Acked-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1cdba550

net/sctp/socket.c

+2 −4
Original line number Diff line number Diff line
@@ -7254,14 +7254,12 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk, 
	/* Hook this new socket in to the bind_hash list. */

	head = &sctp_port_hashtable[sctp_phashfn(sock_net(oldsk),

						 inet_sk(oldsk)->inet_num)];

	local_bh_disable();

	spin_lock(&head->lock);

	spin_lock_bh(&head->lock);

	pp = sctp_sk(oldsk)->bind_hash;

	sk_add_bind_node(newsk, &pp->owner);

	sctp_sk(newsk)->bind_hash = pp;

	inet_sk(newsk)->inet_num = inet_sk(oldsk)->inet_num;

	spin_unlock(&head->lock);

	local_bh_enable();

	spin_unlock_bh(&head->lock);



	/* Copy the bind_addr list from the original endpoint to the new

	 * endpoint so that we can handle restarts properly