---

yaml --- r: 224449 b: refs/heads/master c: 0670b8a h: refs/heads/master i: 224447: b026b34 v: v3
git-mirror · Nov 19, 2010 · 97aa201 · 97aa201
1 parent 12cf9fb
commit 97aa201
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54aafbd4989a684ca876e49bf3e6eb931654dc02
+refs/heads/master: 0670b8ae66daf1d326c7bd10e73daff5f18fcf92
diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c
@@ -1412,9 +1412,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 			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 @@ static int compat_x25_ioctl(struct socket *sock, unsigned int cmd,
 		rc = -EPERM;
 		if (!capable(CAP_NET_ADMIN))
 			break;
-		lock_kernel();
 		rc = x25_route_ioctl(cmd, argp);
-		unlock_kernel();
 		break;
 	case SIOCX25GSUBSCRIP:
 		lock_kernel();