diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-10-21 20:06:56 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-22 14:29:06 -0400 |
| commit | 0e71c55c9e3eb32de08e17152ec739582afc9400 (patch) | |
| tree | e0e18744fb2d17cdf73193d6c2fcbfc296c7ebe3 /net/ipv4/tcp.c | |
| parent | 354e4aa391ed50a4d827ff6fc11e0667d0859b25 (diff) | |
| download | op-kernel-dev-0e71c55c9e3eb32de08e17152ec739582afc9400.zip op-kernel-dev-0e71c55c9e3eb32de08e17152ec739582afc9400.tar.gz | |
tcp: speedup SIOCINQ ioctl
SIOCINQ can use the lock_sock_fast() version to avoid double acquisition
of socket lock.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index b7c2f43..eace049 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -536,13 +536,14 @@ int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg) { struct tcp_sock *tp = tcp_sk(sk); int answ; + bool slow; switch (cmd) { case SIOCINQ: if (sk->sk_state == TCP_LISTEN) return -EINVAL; - lock_sock(sk); + slow = lock_sock_fast(sk); if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV)) answ = 0; else if (sock_flag(sk, SOCK_URGINLINE) || @@ -557,7 +558,7 @@ int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg) answ--; } else answ = tp->urg_seq - tp->copied_seq; - release_sock(sk); + unlock_sock_fast(sk, slow); break; case SIOCATMARK: answ = tp->urg_data && tp->urg_seq == tp->copied_seq; |
