diff options
| author | andrew hendry <andrew.hendry@gmail.com> | 2010-11-18 13:21:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-19 12:40:01 -0800 |
| commit | 1ecd66bf2ce5e0f2bc72ffdeed814bb0e55a60dc (patch) | |
| tree | 023478099312ee1aa78646b5c28ccea68d7dab9b | |
| parent | 70be998c2b44f942f11383496622500136816acb (diff) | |
| download | linux-stable-1ecd66bf2ce5e0f2bc72ffdeed814bb0e55a60dc.tar.gz linux-stable-1ecd66bf2ce5e0f2bc72ffdeed814bb0e55a60dc.tar.bz2 linux-stable-1ecd66bf2ce5e0f2bc72ffdeed814bb0e55a60dc.zip | |
X25: remove bkl in timestamp ioctls
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/x25/af_x25.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index c99029bc411c..22597838cc76 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -1387,19 +1387,15 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) case SIOCGSTAMP: rc = -EINVAL; - lock_kernel(); if (sk) rc = sock_get_timestamp(sk, (struct timeval __user *)argp); - unlock_kernel(); break; case SIOCGSTAMPNS: rc = -EINVAL; - lock_kernel(); if (sk) rc = sock_get_timestampns(sk, (struct timespec __user *)argp); - unlock_kernel(); break; case SIOCGIFADDR: case SIOCSIFADDR: @@ -1689,19 +1685,15 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd, break; case SIOCGSTAMP: rc = -EINVAL; - lock_kernel(); if (sk) rc = compat_sock_get_timestamp(sk, (struct timeval __user*)argp); - unlock_kernel(); break; case SIOCGSTAMPNS: rc = -EINVAL; - lock_kernel(); if (sk) rc = compat_sock_get_timestampns(sk, (struct timespec __user*)argp); - unlock_kernel(); break; case SIOCGIFADDR: case SIOCSIFADDR: |