1 files changed, 22 insertions, 19 deletions

diff --git a/net/socket.c b/net/socket.c
index 6f2a17881972..e1bd5d84d7bf 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -70,6 +70,8 @@
 #include <linux/seq_file.h>
 #include <linux/wanrouter.h>
 #include <linux/if_bridge.h>
+#include <linux/if_frad.h>
+#include <linux/if_vlan.h>
 #include <linux/init.h>
 #include <linux/poll.h>
 #include <linux/cache.h>
@@ -272,7 +274,7 @@ int move_addr_to_user(void *kaddr, int klen, void __user *uaddr, int __user *ule
 
 #define SOCKFS_MAGIC 0x534F434B
 
-static kmem_cache_t * sock_inode_cachep;
+static kmem_cache_t * sock_inode_cachep __read_mostly;
 
 static struct inode *sock_alloc_inode(struct super_block *sb)
 {
@@ -331,7 +333,7 @@ static struct super_block *sockfs_get_sb(struct file_system_type *fs_type,
         return get_sb_pseudo(fs_type, "socket:", &sockfs_ops, SOCKFS_MAGIC);
 }
 
-static struct vfsmount *sock_mnt;
+static struct vfsmount *sock_mnt __read_mostly;
 
 static struct file_system_type sock_fs_type = {
         .name =         "sockfs",
@@ -404,6 +406,7 @@ int sock_map_fd(struct socket *sock)
                 file->f_mode = FMODE_READ | FMODE_WRITE;
                 file->f_flags = O_RDWR;
                 file->f_pos = 0;
+                file->private_data = sock;
                 fd_install(fd, file);
         }
 
@@ -436,6 +439,9 @@ struct socket *sockfd_lookup(int fd, int *err)
                 return NULL;
         }
 
+        if (file->f_op == &socket_file_ops)
+                return file->private_data;      /* set in sock_map_fd */
+
         inode = file->f_dentry->d_inode;
         if (!S_ISSOCK(inode->i_mode)) {
                 *err = -ENOTSOCK;
@@ -661,7 +667,7 @@ static ssize_t sock_aio_read(struct kiocb *iocb, char __user *ubuf,
         }
         iocb->private = x;
         x->kiocb = iocb;
-        sock = SOCKET_I(iocb->ki_filp->f_dentry->d_inode); 
+        sock = iocb->ki_filp->private_data; 
 
         x->async_msg.msg_name = NULL;
         x->async_msg.msg_namelen = 0;
@@ -703,7 +709,7 @@ static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *ubuf,
         }
         iocb->private = x;
         x->kiocb = iocb;
-        sock = SOCKET_I(iocb->ki_filp->f_dentry->d_inode); 
+        sock = iocb->ki_filp->private_data; 
 
         x->async_msg.msg_name = NULL;
         x->async_msg.msg_namelen = 0;
@@ -720,13 +726,13 @@ static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *ubuf,
         return __sock_sendmsg(iocb, sock, &x->async_msg, size);
 }
 
-ssize_t sock_sendpage(struct file *file, struct page *page,
-                      int offset, size_t size, loff_t *ppos, int more)
+static ssize_t sock_sendpage(struct file *file, struct page *page,
+                             int offset, size_t size, loff_t *ppos, int more)
 {
         struct socket *sock;
         int flags;
 
-        sock = SOCKET_I(file->f_dentry->d_inode);
+        sock = file->private_data;
 
         flags = !(file->f_flags & O_NONBLOCK) ? 0 : MSG_DONTWAIT;
         if (more)
@@ -735,14 +741,14 @@ ssize_t sock_sendpage(struct file *file, struct page *page,
         return sock->ops->sendpage(sock, page, offset, size, flags);
 }
 
-static int sock_readv_writev(int type, struct inode * inode,
+static int sock_readv_writev(int type,
                              struct file * file, const struct iovec * iov,
                              long count, size_t size)
 {
         struct msghdr msg;
         struct socket *sock;
 
-        sock = SOCKET_I(inode);
+        sock = file->private_data;
 
         msg.msg_name = NULL;
         msg.msg_namelen = 0;
@@ -769,7 +775,7 @@ static ssize_t sock_readv(struct file *file, const struct iovec *vector,
         int i;
         for (i = 0 ; i < count ; i++)
                 tot_len += vector[i].iov_len;
-        return sock_readv_writev(VERIFY_WRITE, file->f_dentry->d_inode,
+        return sock_readv_writev(VERIFY_WRITE,
                                  file, vector, count, tot_len);
 }
         
@@ -780,7 +786,7 @@ static ssize_t sock_writev(struct file *file, const struct iovec *vector,
         int i;
         for (i = 0 ; i < count ; i++)
                 tot_len += vector[i].iov_len;
-        return sock_readv_writev(VERIFY_READ, file->f_dentry->d_inode,
+        return sock_readv_writev(VERIFY_READ,
                                  file, vector, count, tot_len);
 }
 
@@ -834,7 +840,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
         void __user *argp = (void __user *)arg;
         int pid, err;
 
-        sock = SOCKET_I(file->f_dentry->d_inode);
+        sock = file->private_data;
         if (cmd >= SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE + 15)) {
                 err = dev_ioctl(cmd, argp);
         } else
@@ -933,18 +939,18 @@ static unsigned int sock_poll(struct file *file, poll_table * wait)
         /*
          *      We can't return errors to poll, so it's either yes or no. 
          */
-        sock = SOCKET_I(file->f_dentry->d_inode);
+        sock = file->private_data;
         return sock->ops->poll(file, sock, wait);
 }
 
 static int sock_mmap(struct file * file, struct vm_area_struct * vma)
 {
-        struct socket *sock = SOCKET_I(file->f_dentry->d_inode);
+        struct socket *sock = file->private_data;
 
         return sock->ops->mmap(file, sock, vma);
 }
 
-int sock_close(struct inode *inode, struct file *filp)
+static int sock_close(struct inode *inode, struct file *filp)
 {
         /*
          *      It was possible the inode is NULL we were 
@@ -989,7 +995,7 @@ static int sock_fasync(int fd, struct file *filp, int on)
                         return -ENOMEM;
         }
 
-        sock = SOCKET_I(filp->f_dentry->d_inode);
+        sock = filp->private_data;
 
         if ((sk=sock->sk) == NULL) {
                 kfree(fna);
@@ -2023,9 +2029,6 @@ int sock_unregister(int family)
         return 0;
 }
 
-
-extern void sk_init(void);
-
 void __init sock_init(void)
 {
         /*