diff options
author | Peter Zijlstra <peterz@infradead.org> | 2014-03-17 13:06:10 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-04-18 08:20:48 -0400 |
commit | 4e857c58efeb99393cba5a5d0d8ec7117183137c (patch) | |
tree | 3f6fd464e4fddb2fe90374c075c9d06603cf8bbc /net/ipv4/tcp_output.c | |
parent | 1b15611e1c30b37abe393d411c316cd659920bf5 (diff) |
arch: Mass conversion of smp_mb__*()
Mostly scripted conversion of the smp_mb__* barriers.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/n/tip-55dhyhocezdw1dg7u19hmh1u@git.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-arch@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r-- | net/ipv4/tcp_output.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 025e25093984..366cf06587b8 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -1930,10 +1930,8 @@ static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle, | |||
1930 | /* It is possible TX completion already happened | 1930 | /* It is possible TX completion already happened |
1931 | * before we set TSQ_THROTTLED, so we must | 1931 | * before we set TSQ_THROTTLED, so we must |
1932 | * test again the condition. | 1932 | * test again the condition. |
1933 | * We abuse smp_mb__after_clear_bit() because | ||
1934 | * there is no smp_mb__after_set_bit() yet | ||
1935 | */ | 1933 | */ |
1936 | smp_mb__after_clear_bit(); | 1934 | smp_mb__after_atomic(); |
1937 | if (atomic_read(&sk->sk_wmem_alloc) > limit) | 1935 | if (atomic_read(&sk->sk_wmem_alloc) > limit) |
1938 | break; | 1936 | break; |
1939 | } | 1937 | } |