commit 0670b8ae66daf1d326c7bd10e73daff5f18fcf92
author andrew hendry <andrew.hendry@gmail.com> Thu Nov 18 13:21:35 2010 +0000
committer David S. Miller <davem@davemloft.net> Fri Nov 19 12:40:02 2010 -0800
tree 03d0b76eabba6154572e44b66c6c1c1f4fee5bfd
parent 54aafbd4989a684ca876e49bf3e6eb931654dc02

X25: remove bkl in routing ioctls

Routing doesn't use the socket data and is protected by x25_route_list_lock

Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/x25/af_x25.c

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 2f235a6..2351ace 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1412,9 +1412,7 @@
 			rc = -EPERM;
 			if (!capable(CAP_NET_ADMIN))
 				break;
-			lock_kernel();
 			rc = x25_route_ioctl(cmd, argp);
-			unlock_kernel();
 			break;
 		case SIOCX25GSUBSCRIP:
 			lock_kernel();
@@ -1710,9 +1708,7 @@
 		rc = -EPERM;
 		if (!capable(CAP_NET_ADMIN))
 			break;
-		lock_kernel();
 		rc = x25_route_ioctl(cmd, argp);
-		unlock_kernel();
 		break;
 	case SIOCX25GSUBSCRIP:
 		lock_kernel();