From 9dbead444b6868ede00802feae62937f1aed852f Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Sun, 21 Oct 2012 20:06:56 +0000
Subject: [PATCH] --- yaml --- r: 340428 b: refs/heads/master c:
 0e71c55c9e3eb32de08e17152ec739582afc9400 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/ipv4/tcp.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7356d252e7d1..05e39a9c0850 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 354e4aa391ed50a4d827ff6fc11e0667d0859b25
+refs/heads/master: 0e71c55c9e3eb32de08e17152ec739582afc9400
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index b7c2f439b54f..eace049da052 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/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;