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

Commit 7e3aab4a authored by David S. Miller's avatar David S. Miller
Browse files

inet_diag: Missed conversion after changing inet ehash lockl to spinlocks. 



They are no longer a rwlocks.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 176301e8

net/ipv4/inet_diag.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -778,7 +778,7 @@ skip_listen_ht: 




	for (i = s_i; i < hashinfo->ehash_size; i++) {

	for (i = s_i; i < hashinfo->ehash_size; i++) {

		struct inet_ehash_bucket *head = &hashinfo->ehash[i];

		struct inet_ehash_bucket *head = &hashinfo->ehash[i];

		rwlock_t *lock = inet_ehash_lockp(hashinfo, i);

		spinlock_t *lock = inet_ehash_lockp(hashinfo, i);

		struct sock *sk;

		struct sock *sk;

		struct hlist_nulls_node *node;

		struct hlist_nulls_node *node;
@@ -791,7 +791,7 @@ skip_listen_ht: 
		if (i > s_i)

		if (i > s_i)

			s_num = 0;

			s_num = 0;





		read_lock_bh(lock);

		spin_lock_bh(lock);

		sk_nulls_for_each(sk, node, &head->chain) {

		sk_nulls_for_each(sk, node, &head->chain) {

			struct inet_sock *inet = inet_sk(sk);

			struct inet_sock *inet = inet_sk(sk);
@@ -806,7 +806,7 @@ skip_listen_ht: 
			    r->id.idiag_dport)

			    r->id.idiag_dport)

				goto next_normal;

				goto next_normal;

			if (inet_csk_diag_dump(sk, skb, cb) < 0) {

			if (inet_csk_diag_dump(sk, skb, cb) < 0) {

				read_unlock_bh(lock);

				spin_unlock_bh(lock);

				goto done;

				goto done;

			}

			}

next_normal:

next_normal:
@@ -828,14 +828,14 @@ next_normal: 
				    r->id.idiag_dport)

				    r->id.idiag_dport)

					goto next_dying;

					goto next_dying;

				if (inet_twsk_diag_dump(tw, skb, cb) < 0) {

				if (inet_twsk_diag_dump(tw, skb, cb) < 0) {

					read_unlock_bh(lock);

					spin_unlock_bh(lock);

					goto done;

					goto done;

				}

				}

next_dying:

next_dying:

				++num;

				++num;

			}

			}

		}

		}

		read_unlock_bh(lock);

		spin_unlock_bh(lock);

	}

	}





done:

done: