1 files changed, 9 insertions, 9 deletions

diff --git a/net/socket.c b/net/socket.c
index 3cd96fe8191d..540013ea8620 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -364,26 +364,26 @@ static int sock_alloc_fd(struct file **filep)
 
 static int sock_attach_fd(struct socket *sock, struct file *file)
 {
+        struct dentry *dentry;
         struct qstr name = { .name = "" };
 
-        file->f_path.dentry = d_alloc(sock_mnt->mnt_sb->s_root, &name);
-        if (unlikely(!file->f_path.dentry))
+        dentry = d_alloc(sock_mnt->mnt_sb->s_root, &name);
+        if (unlikely(!dentry))
                 return -ENOMEM;
 
-        file->f_path.dentry->d_op = &sockfs_dentry_operations;
+        dentry->d_op = &sockfs_dentry_operations;
         /*
          * We dont want to push this dentry into global dentry hash table.
          * We pretend dentry is already hashed, by unsetting DCACHE_UNHASHED
          * This permits a working /proc/$pid/fd/XXX on sockets
          */
-        file->f_path.dentry->d_flags &= ~DCACHE_UNHASHED;
-        d_instantiate(file->f_path.dentry, SOCK_INODE(sock));
-        file->f_path.mnt = mntget(sock_mnt);
-        file->f_mapping = file->f_path.dentry->d_inode->i_mapping;
+        dentry->d_flags &= ~DCACHE_UNHASHED;
+        d_instantiate(dentry, SOCK_INODE(sock));
 
         sock->file = file;
-        file->f_op = SOCK_INODE(sock)->i_fop = &socket_file_ops;
-        file->f_mode = FMODE_READ | FMODE_WRITE;
+        init_file(file, sock_mnt, dentry, FMODE_READ | FMODE_WRITE,
+                  &socket_file_ops);
+        SOCK_INODE(sock)->i_fop = &socket_file_ops;
         file->f_flags = O_RDWR;
         file->f_pos = 0;
         file->private_data = sock;