a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

X25: remove bkl in timestamp ioctls

Browse Source 
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:20 +00:00 committed by David S. Miller
parent 70be998c2b
commit 1ecd66bf2c
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/x25/af_x25.c
View File

@ -1387,19 +1387,15 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
case SIOCGSTAMP: case SIOCGSTAMP:
rc = -EINVAL; rc = -EINVAL;
lock_kernel();
if (sk) if (sk)
rc = sock_get_timestamp(sk, rc = sock_get_timestamp(sk,
(struct timeval __user *)argp); (struct timeval __user *)argp);
unlock_kernel();
break; break;
case SIOCGSTAMPNS: case SIOCGSTAMPNS:
rc = -EINVAL; rc = -EINVAL;
lock_kernel();
if (sk) if (sk)
rc = sock_get_timestampns(sk, rc = sock_get_timestampns(sk,
(struct timespec __user *)argp); (struct timespec __user *)argp);
unlock_kernel();
break; break;
case SIOCGIFADDR: case SIOCGIFADDR:
case SIOCSIFADDR: case SIOCSIFADDR:
@ -1689,19 +1685,15 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd,
break; break;
case SIOCGSTAMP: case SIOCGSTAMP:
rc = -EINVAL; rc = -EINVAL;
lock_kernel();
if (sk) if (sk)
rc = compat_sock_get_timestamp(sk, rc = compat_sock_get_timestamp(sk,
(struct timeval __user*)argp); (struct timeval __user*)argp);
unlock_kernel();
break; break;
case SIOCGSTAMPNS: case SIOCGSTAMPNS:
rc = -EINVAL; rc = -EINVAL;
lock_kernel();
if (sk) if (sk)
rc = compat_sock_get_timestampns(sk, rc = compat_sock_get_timestampns(sk,
(struct timespec __user*)argp); (struct timespec __user*)argp);
unlock_kernel();
break; break;
case SIOCGIFADDR: case SIOCGIFADDR:
case SIOCSIFADDR: case SIOCSIFADDR: