diff options
| author | Benjamin LaHaise <bcrl@redhat.com> | 2002-10-08 03:47:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-10-08 03:47:13 -0700 |
| commit | 3525bea4ce3bcd70f8072bf67e6ac9f76e201c06 (patch) | |
| tree | ba4f73991a9c44095930b72464dfb6628734172b /net/ipv4/tcp_timer.c | |
| parent | 90e464a4f8660a1de4be9c4f73ba6296625219e4 (diff) | |
[AIO]: First stage of AIO infrastructure for networking.
- Change socket lock users to owner which is a pointer.
- Add sock_owned_by_user
Diffstat (limited to 'net/ipv4/tcp_timer.c')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 3901d11cac15..d9a4e91003ca 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -213,7 +213,7 @@ static void tcp_delack_timer(unsigned long data) struct tcp_opt *tp = tcp_sk(sk); bh_lock_sock(sk); - if (sk->lock.users) { + if (sock_owned_by_user(sk)) { /* Try again later. */ tp->ack.blocked = 1; NET_INC_STATS_BH(DelayedACKLocked); @@ -421,7 +421,7 @@ static void tcp_write_timer(unsigned long data) int event; bh_lock_sock(sk); - if (sk->lock.users) { + if (sock_owned_by_user(sk)) { /* Try again later */ if (!mod_timer(&tp->retransmit_timer, jiffies + (HZ/20))) sock_hold(sk); @@ -581,7 +581,7 @@ static void tcp_keepalive_timer (unsigned long data) /* Only process if socket is not in use. */ bh_lock_sock(sk); - if (sk->lock.users) { + if (sock_owned_by_user(sk)) { /* Try again later. */ tcp_reset_keepalive_timer (sk, HZ/20); goto out; |