From 12cf9fbb7fc07d30a938680436d70e37db396f7e Mon Sep 17 00:00:00 2001 From: andrew hendry Date: Thu, 18 Nov 2010 13:21:28 +0000 Subject: [PATCH] --- yaml --- r: 224448 b: refs/heads/master c: 54aafbd4989a684ca876e49bf3e6eb931654dc02 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/x25/af_x25.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2f0f915848c2..10515b41955f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ecd66bf2ce5e0f2bc72ffdeed814bb0e55a60dc +refs/heads/master: 54aafbd4989a684ca876e49bf3e6eb931654dc02 diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c index 22597838cc76..2f235a6cb3b1 100644 --- a/trunk/net/x25/af_x25.c +++ b/trunk/net/x25/af_x25.c @@ -1361,12 +1361,10 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) case TIOCOUTQ: { int amount; - lock_kernel(); amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk); if (amount < 0) amount = 0; rc = put_user(amount, (unsigned int __user *)argp); - unlock_kernel(); break; } @@ -1377,11 +1375,11 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) * These two are safe on a single CPU system as * only user tasks fiddle here */ - lock_kernel(); + lock_sock(sk); if ((skb = skb_peek(&sk->sk_receive_queue)) != NULL) amount = skb->len; + release_sock(sk); rc = put_user(amount, (unsigned int __user *)argp); - unlock_kernel(); break; }