From d043b291380adfa9165d8354f15800ad7eeb2aa6 Mon Sep 17 00:00:00 2001 From: andrew hendry Date: Sun, 16 May 2010 23:00:35 +0000 Subject: [PATCH] --- yaml --- r: 195172 b: refs/heads/master c: 935e2a26b85003c0bd52b6c92712c2f77a5f9d33 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/x25/af_x25.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 034a50341c5c..d2df14622296 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37cda78741ecdbf45dd9b64e4c99dbdb11b47b46 +refs/heads/master: 935e2a26b85003c0bd52b6c92712c2f77a5f9d33 diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c index e5c1e3298f8a..5e86d4e97dce 100644 --- a/trunk/net/x25/af_x25.c +++ b/trunk/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; }