summaryrefslogtreecommitdiff
path: root/net/x25
diff options
context:
space:
mode:
authorandrew hendry <andrew.hendry@gmail.com>2010-05-16 23:00:35 +0000
committerDavid S. Miller <davem@davemloft.net>2010-05-17 17:39:28 -0700
commit935e2a26b85003c0bd52b6c92712c2f77a5f9d33 (patch)
tree04dd53f563714e1c3ca8ae91536a7ff02cf28fa4 /net/x25
parent37cda78741ecdbf45dd9b64e4c99dbdb11b47b46 (diff)
downloadlinux-3.10-935e2a26b85003c0bd52b6c92712c2f77a5f9d33.tar.gz
linux-3.10-935e2a26b85003c0bd52b6c92712c2f77a5f9d33.tar.bz2
linux-3.10-935e2a26b85003c0bd52b6c92712c2f77a5f9d33.zip
X25: Remove bkl in sockopts
Removes the BKL in x25 setsock and getsockopts. Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/x25')
-rw-r--r--net/x25/af_x25.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index e5c1e3298f8..5e86d4e97dc 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;
}