diff options
author | Stefan Raspl <stefan.raspl@linux.ibm.com> | 2018-05-03 11:57:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-05-03 14:47:31 -0400 |
commit | bda27ff5c4526f80a7620a94ecfe8dca153e3696 (patch) | |
tree | 886341f8a24668c1f8a4a7c813f0404e9bb72187 | |
parent | a6920d1d130c3de039be982eba42542d329dc64c (diff) |
smc: fix sendpage() call
The sendpage() call grabs the sock lock before calling the default
implementation - which tries to grab it once again.
Signed-off-by: Stefan Raspl <raspl@linux.ibm.com>
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com><
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/smc/af_smc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index d03b8d29ffc0..544bab42f925 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c | |||
@@ -1315,8 +1315,11 @@ static ssize_t smc_sendpage(struct socket *sock, struct page *page, | |||
1315 | 1315 | ||
1316 | smc = smc_sk(sk); | 1316 | smc = smc_sk(sk); |
1317 | lock_sock(sk); | 1317 | lock_sock(sk); |
1318 | if (sk->sk_state != SMC_ACTIVE) | 1318 | if (sk->sk_state != SMC_ACTIVE) { |
1319 | release_sock(sk); | ||
1319 | goto out; | 1320 | goto out; |
1321 | } | ||
1322 | release_sock(sk); | ||
1320 | if (smc->use_fallback) | 1323 | if (smc->use_fallback) |
1321 | rc = kernel_sendpage(smc->clcsock, page, offset, | 1324 | rc = kernel_sendpage(smc->clcsock, page, offset, |
1322 | size, flags); | 1325 | size, flags); |
@@ -1324,7 +1327,6 @@ static ssize_t smc_sendpage(struct socket *sock, struct page *page, | |||
1324 | rc = sock_no_sendpage(sock, page, offset, size, flags); | 1327 | rc = sock_no_sendpage(sock, page, offset, size, flags); |
1325 | 1328 | ||
1326 | out: | 1329 | out: |
1327 | release_sock(sk); | ||
1328 | return rc; | 1330 | return rc; |
1329 | } | 1331 | } |
1330 | 1332 | ||