From b026b34d03327b8d76bcea00c0c305d93124fdaa Mon Sep 17 00:00:00 2001 From: andrew hendry Date: Thu, 18 Nov 2010 13:21:20 +0000 Subject: [PATCH] --- yaml --- r: 224447 b: refs/heads/master c: 1ecd66bf2ce5e0f2bc72ffdeed814bb0e55a60dc h: refs/heads/master i: 224445: a2ed29e48c36a45e35c4e2ec63c68c8aca5111dc 224443: d3cf53a4d4a0717a7c056f34ae3872e125810006 224439: 030dec5308a8269dd59231cf275030f8295a4ae6 224431: 9bd8045b609ed4e34c06b79f032f793c5a620689 224415: ff53a2a581ad61519e101cc9ebd11e1b766b85d0 224383: 179c830d13280074e8ffb4c08080d9bbcb67d89e v: v3 --- [refs] | 2 +- trunk/net/x25/af_x25.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 8d6ca1f69647..2f0f915848c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70be998c2b44f942f11383496622500136816acb +refs/heads/master: 1ecd66bf2ce5e0f2bc72ffdeed814bb0e55a60dc diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c index c99029bc411c..22597838cc76 100644 --- a/trunk/net/x25/af_x25.c +++ b/trunk/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: