Skip to content

Commit

Permalink
inet_diag: Missed conversion after changing inet ehash lockl to spinl…
Browse files Browse the repository at this point in the history
…ocks.

They are no longer a rwlocks.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Nov 22, 2008
1 parent 176301e commit 7e3aab4
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions net/ipv4/inet_diag.c
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)

for (i = s_i; i < hashinfo->ehash_size; 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 hlist_nulls_node *node;

Expand All @@ -791,7 +791,7 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
if (i > s_i)
s_num = 0;

read_lock_bh(lock);
spin_lock_bh(lock);
sk_nulls_for_each(sk, node, &head->chain) {
struct inet_sock *inet = inet_sk(sk);

Expand All @@ -806,7 +806,7 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
r->id.idiag_dport)
goto next_normal;
if (inet_csk_diag_dump(sk, skb, cb) < 0) {
read_unlock_bh(lock);
spin_unlock_bh(lock);
goto done;
}
next_normal:
Expand All @@ -828,14 +828,14 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
r->id.idiag_dport)
goto next_dying;
if (inet_twsk_diag_dump(tw, skb, cb) < 0) {
read_unlock_bh(lock);
spin_unlock_bh(lock);
goto done;
}
next_dying:
++num;
}
}
read_unlock_bh(lock);
spin_unlock_bh(lock);
}

done:
Expand Down

0 comments on commit 7e3aab4

Please sign in to comment.