Merge branch 'work.open3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs open-related updates from Al Viro:

 - "do we need fput() or put_filp()" rules are gone - it's always fput()
   now. We keep track of that state where it belongs - in ->f_mode.

 - int *opened mess killed - in finish_open(), in ->atomic_open()
   instances and in fs/namei.c code around do_last()/lookup_open()/atomic_open().

 - alloc_file() wrappers with saner calling conventions are introduced
   (alloc_file_clone() and alloc_file_pseudo()); callers converted, with
   much simplification.

 - while we are at it, saner calling conventions for path_init() and
   link_path_walk(), simplifying things inside fs/namei.c (both on
   open-related paths and elsewhere).

* 'work.open3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (40 commits)
  few more cleanups of link_path_walk() callers
  allow link_path_walk() to take ERR_PTR()
  make path_init() unconditionally paired with terminate_walk()
  document alloc_file() changes
  make alloc_file() static
  do_shmat(): grab shp->shm_file earlier, switch to alloc_file_clone()
  new helper: alloc_file_clone()
  create_pipe_files(): switch the first allocation to alloc_file_pseudo()
  anon_inode_getfile(): switch to alloc_file_pseudo()
  hugetlb_file_setup(): switch to alloc_file_pseudo()
  ocxlflash_getfile(): switch to alloc_file_pseudo()
  cxl_getfile(): switch to alloc_file_pseudo()
  ... and switch shmem_file_setup() to alloc_file_pseudo()
  __shmem_file_setup(): reorder allocations
  new wrapper: alloc_file_pseudo()
  kill FILE_{CREATED,OPENED}
  switch atomic_open() and lookup_open() to returning 0 in all success cases
  document ->atomic_open() changes
  ->atomic_open(): return 0 in all success cases
  get rid of 'opened' in path_openat() and the helpers downstream
  ...

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;
 }