* [PATCH 4/4] X25: Remove bkl in sockopts
@ 2010-05-17 9:00 Andrew Hendry
2010-05-18 0:39 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Andrew Hendry @ 2010-05-17 9:00 UTC (permalink / raw)
To: netdev
Removes the BKL in x25 setsock and getsockopts.
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
---
net/x25/af_x25.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index e5c1e32..5e86d4e 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -453,7 +453,6 @@ static int x25_setsockopt(struct socket *sock, int level, int optname,
struct sock *sk = sock->sk;
int rc = -ENOPROTOOPT;
- lock_kernel();
if (level != SOL_X25 || optname != X25_QBITINCL)
goto out;
@@ -471,7 +470,6 @@ static int x25_setsockopt(struct socket *sock, int level, int optname,
clear_bit(X25_Q_BIT_FLAG, &x25_sk(sk)->flags);
rc = 0;
out:
- unlock_kernel();
return rc;
}
@@ -481,7 +479,6 @@ static int x25_getsockopt(struct socket *sock, int level, int optname,
struct sock *sk = sock->sk;
int val, len, rc = -ENOPROTOOPT;
- lock_kernel();
if (level != SOL_X25 || optname != X25_QBITINCL)
goto out;
@@ -502,7 +499,6 @@ static int x25_getsockopt(struct socket *sock, int level, int optname,
val = test_bit(X25_Q_BIT_FLAG, &x25_sk(sk)->flags);
rc = copy_to_user(optval, &val, len) ? -EFAULT : 0;
out:
- unlock_kernel();
return rc;
}
--
1.5.6.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 4/4] X25: Remove bkl in sockopts
2010-05-17 9:00 [PATCH 4/4] X25: Remove bkl in sockopts Andrew Hendry
@ 2010-05-18 0:39 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-05-18 0:39 UTC (permalink / raw)
To: andrew.hendry; +Cc: netdev
From: Andrew Hendry <andrew.hendry@gmail.com>
Date: Mon, 17 May 2010 19:00:35 +1000
>
> Removes the BKL in x25 setsock and getsockopts.
>
> 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-05-18 0:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-17 9:00 [PATCH 4/4] X25: Remove bkl in sockopts Andrew Hendry
2010-05-18 0:39 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).