Back out my lats commit of locking down a socket, it conflicts with hsu's work.

Requested by:	hsu

1 files changed, 2 insertions, 5 deletions

diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 8a6176d..15837d3 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1777,22 +1777,19 @@ fgetsock(struct thread *td, int fd, struct socket **spp, u_int *fflagp)
 		*spp = (struct socket *)fp->f_data;
 		if (fflagp)
 			*fflagp = fp->f_flag;
-		SOCK_LOCK(*spp);
 		soref(*spp);
-		SOCK_UNLOCK(*spp);
 	}
 	FILEDESC_UNLOCK(td->td_proc->p_fd);
 	return(error);
 }
 
 /*
- * Drop the reference count on the the socket and release the lock.
- * The last reference closes the socket.  The socket must be unlocked.
+ * Drop the reference count on the the socket and XXX release the SX lock in
+ * the future.  The last reference closes the socket.
  */
 void
 fputsock(struct socket *so)
 {
-	SOCK_LOCK(so);
 	sorele(so);
 }