patch-2.3.9 linux/net/socket.c

Next file: linux/net/sunrpc/xprt.c
Previous file: linux/net/ipv4/udp.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.8/linux/net/socket.c linux/net/socket.c
@@ -950,7 +950,6 @@
 	struct msghdr msg;
 	struct iovec iov;
 	
-	lock_kernel();
 	sock = sockfd_lookup(fd, &err);
 	if (!sock)
 		goto out;
@@ -977,7 +976,6 @@
 out_put:		
 	sockfd_put(sock);
 out:
-	unlock_kernel();
 	return err;
 }
 
@@ -1005,7 +1003,6 @@
 	char address[MAX_SOCK_ADDR];
 	int err,err2;
 
-	lock_kernel();
 	sock = sockfd_lookup(fd, &err);
 	if (!sock)
 		goto out;
@@ -1030,7 +1027,6 @@
 	}
 	sockfd_put(sock);			
 out:
-	unlock_kernel();
 	return err;
 }
 
@@ -1123,8 +1119,6 @@
 	struct msghdr msg_sys;
 	int err, ctl_len, iov_size, total_len;
 	
-	lock_kernel();
-
 	err = -EFAULT;
 	if (copy_from_user(&msg_sys,msg,sizeof(struct msghdr)))
 		goto out; 
@@ -1194,7 +1188,6 @@
 out_put:
 	sockfd_put(sock);
 out:       
-	unlock_kernel();
 	return err;
 }
 
@@ -1218,7 +1211,6 @@
 	struct sockaddr *uaddr;
 	int *uaddr_len;
 	
-	lock_kernel();
 	err=-EFAULT;
 	if (copy_from_user(&msg_sys,msg,sizeof(struct msghdr)))
 		goto out;
@@ -1282,7 +1274,6 @@
 out_put:
 	sockfd_put(sock);
 out:
-	unlock_kernel();
 	return err;
 }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)