1 files changed, 5 insertions, 24 deletions

diff --git a/net/socket.c b/net/socket.c
index 8c24d5dc4bc8..792f0313ea91 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -388,39 +388,20 @@ static struct file_system_type sock_fs_type = {
 
 struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname)
 {
-        struct qstr name = { .name = "" };
-        struct path path;
         struct file *file;
 
-        if (dname) {
-                name.name = dname;
-                name.len = strlen(name.name);
-        } else if (sock->sk) {
-                name.name = sock->sk->sk_prot_creator->name;
-                name.len = strlen(name.name);
-        }
-        path.dentry = d_alloc_pseudo(sock_mnt->mnt_sb, &name);
-        if (unlikely(!path.dentry)) {
-                sock_release(sock);
-                return ERR_PTR(-ENOMEM);
-        }
-        path.mnt = mntget(sock_mnt);
-
-        d_instantiate(path.dentry, SOCK_INODE(sock));
+        if (!dname)
+                dname = sock->sk ? sock->sk->sk_prot_creator->name : "";
 
-        file = alloc_file(&path, FMODE_READ | FMODE_WRITE,
-                  &socket_file_ops);
+        file = alloc_file_pseudo(SOCK_INODE(sock), sock_mnt, dname,
+                                O_RDWR | (flags & O_NONBLOCK),
+                                &socket_file_ops);
         if (IS_ERR(file)) {
-                /* drop dentry, keep inode for a bit */
-                ihold(d_inode(path.dentry));
-                path_put(&path);
-                /* ... and now kill it properly */
                 sock_release(sock);
                 return file;
         }
 
         sock->file = file;
-        file->f_flags = O_RDWR | (flags & O_NONBLOCK);
         file->private_data = sock;
         return file;
 }