* [PATCH 2/4] X25: remove bkl in timestamp ioctls
@ 2010-11-18 23:21 Andrew Hendry
2010-11-19 20:41 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Andrew Hendry @ 2010-11-18 23:21 UTC (permalink / raw)
To: netdev
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
---
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 c99029b..2259783 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:
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 2/4] X25: remove bkl in timestamp ioctls
2010-11-18 23:21 [PATCH 2/4] X25: remove bkl in timestamp ioctls Andrew Hendry
@ 2010-11-19 20:41 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-11-19 20:41 UTC (permalink / raw)
To: andrew.hendry; +Cc: netdev
From: Andrew Hendry <andrew.hendry@gmail.com>
Date: Fri, 19 Nov 2010 10:21:20 +1100
>
> Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-11-19 20:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-11-18 23:21 [PATCH 2/4] X25: remove bkl in timestamp ioctls Andrew Hendry
2010-11-19 20:41 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.