--- 2.3.30pre1-socket_VFS/net/socket.c.~1~	Tue Oct 12 18:13:38 1999
+++ 2.3.30pre1-socket_VFS/net/socket.c	Thu Nov 25 21:39:07 1999
@@ -44,6 +44,7 @@
  *		Tigran Aivazian	:	sys_send(args) calls sys_sendto(args, NULL, 0)
  *		Tigran Aivazian	:	Made listen(2) backlog sanity checks 
  *					protocol-independent
+ *		Andrea Arcangeli:	VFS interface cleanups.
  *
  *
  *		This program is free software; you can redistribute it and/or
@@ -176,7 +177,7 @@
  *	Statistics counters of the socket lists
  */
 
-static int sockets_in_use  = 0;
+static atomic_t sockets_in_use  = ATOMIC_INIT(0);
 
 /*
  *	Support routines. Move socket addresses back and forth across the kernel/user
@@ -261,23 +262,14 @@
 			goto out;
 		}
 
-		lock_kernel();
 		file->f_dentry = d_alloc_root(sock->inode);
 		if (!file->f_dentry) {
-			unlock_kernel();
 			put_filp(file);
 			put_unused_fd(fd);
 			fd = -ENOMEM;
 			goto out;
 		}
 
-		/*
-		 * The socket maintains a reference to the inode, so we
-		 * have to increment the count.
-		 */
-		sock->inode->i_count++;
-		unlock_kernel();
-
 		file->f_op = &socket_file_ops;
 		file->f_mode = 3;
 		file->f_flags = O_RDWR;
@@ -340,18 +332,9 @@
 	struct inode * inode;
 	struct socket * sock;
 
-	lock_kernel();
-	/* Damn! get_empty_inode is not SMP safe.
-	   I ask, why does it have decorative spinlock
-	   at the very beginning? Probably, dcache ops should
-	   be lock_kernel'ed inside inode.c
-	 */
 	inode = get_empty_inode();
-	if (!inode) {
-		unlock_kernel();
+	if (!inode)
 		return NULL;
-	}
-	unlock_kernel();
 
 	sock = socki_lookup(inode);
 
@@ -369,7 +352,7 @@
 	sock->sk = NULL;
 	sock->file = NULL;
 
-	sockets_in_use++;
+	atomic_inc(&sockets_in_use);
 	return sock;
 }
 
@@ -392,9 +375,8 @@
 	if (sock->fasync_list)
 		printk(KERN_ERR "sock_release: fasync list not empty!\n");
 
-	--sockets_in_use;	/* Bookkeeping.. */
+	atomic_dec(&sockets_in_use);	/* Bookkeeping.. */
 	sock->file=NULL;
-	iput(sock->inode);
 }
 
 int sock_sendmsg(struct socket *sock, struct msghdr *msg, int size)
@@ -1604,7 +1586,7 @@
 
 int socket_get_info(char *buffer, char **start, off_t offset, int length)
 {
-	int len = sprintf(buffer, "sockets: used %d\n", sockets_in_use);
+	int len = sprintf(buffer, "sockets: used %d\n", atomic_read(&sockets_in_use));
 	if (offset >= len)
 	{
 		*start = buffer;