diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-01-22 23:44:59 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-03-05 10:55:45 +0100 |
| commit | 77b2283604bdd7053494a97b0e2fee97148206c6 (patch) | |
| tree | 4d5c54156d64fd80de765cc18dc7e4a68b5ec5e1 /net/x25/x25_out.c | |
| parent | ufs: remove the BKL (diff) | |
| download | linux-77b2283604bdd7053494a97b0e2fee97148206c6.tar.xz linux-77b2283604bdd7053494a97b0e2fee97148206c6.zip | |
x25: remove the BKL
This replaces all instances of lock_kernel in x25
with lock_sock, taking care to release the socket
lock around sleeping functions (sock_alloc_send_skb
and skb_recv_datagram). It is not clear whether
this is a correct solution, but it seem to be what
other protocols do in the same situation.
Includes a fix suggested by Eric Dumazet.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: David S. Miller <davem@davemloft.net>
Tested-by: Andrew Hendry <andrew.hendry@gmail.com>
Cc: linux-x25@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Diffstat (limited to 'net/x25/x25_out.c')
| -rw-r--r-- | net/x25/x25_out.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/x25/x25_out.c b/net/x25/x25_out.c index d00649fb251d..0144271d2184 100644 --- a/net/x25/x25_out.c +++ b/net/x25/x25_out.c @@ -68,8 +68,11 @@ int x25_output(struct sock *sk, struct sk_buff *skb) frontlen = skb_headroom(skb); while (skb->len > 0) { - if ((skbn = sock_alloc_send_skb(sk, frontlen + max_len, - noblock, &err)) == NULL){ + release_sock(sk); + skbn = sock_alloc_send_skb(sk, frontlen + max_len, + noblock, &err); + lock_sock(sk); + if (!skbn) { if (err == -EWOULDBLOCK && noblock){ kfree_skb(skb); return sent; |