openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

X25: remove bkl in inq and outq ioctls 

Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
andrew hendry 2010-11-18 13:21:28 +00:00 committed by David S. Miller
parent 1ecd66bf2c
commit 54aafbd498
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/x25/af_x25.c
View File

@ -1361,12 +1361,10 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
case TIOCOUTQ: { case TIOCOUTQ: {
int amount; int amount;
lock_kernel();
amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk); amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
if (amount < 0) if (amount < 0)
amount = 0; amount = 0;
rc = put_user(amount, (unsigned int __user *)argp); rc = put_user(amount, (unsigned int __user *)argp);
unlock_kernel();
break; 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 * These two are safe on a single CPU system as
* only user tasks fiddle here * only user tasks fiddle here
*/ */
lock_kernel(); lock_sock(sk);
if ((skb = skb_peek(&sk->sk_receive_queue)) != NULL) if ((skb = skb_peek(&sk->sk_receive_queue)) != NULL)
amount = skb->len; amount = skb->len;
release_sock(sk);
rc = put_user(amount, (unsigned int __user *)argp); rc = put_user(amount, (unsigned int __user *)argp);
unlock_kernel();
break; break;
} }