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, 4 insertions, 20 deletions

diff --git a/fs/aio.c b/fs/aio.c
index 27454594e37a..16f1f25bfd89 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -202,9 +202,7 @@ static const struct address_space_operations aio_ctx_aops;
 
 static struct file *aio_private_file(struct kioctx *ctx, loff_t nr_pages)
 {
-        struct qstr this = QSTR_INIT("[aio]", 5);
         struct file *file;
-        struct path path;
         struct inode *inode = alloc_anon_inode(aio_mnt->mnt_sb);
         if (IS_ERR(inode))
                 return ERR_CAST(inode);
@@ -213,31 +211,17 @@ static struct file *aio_private_file(struct kioctx *ctx, loff_t nr_pages)
         inode->i_mapping->private_data = ctx;
         inode->i_size = PAGE_SIZE * nr_pages;
 
-        path.dentry = d_alloc_pseudo(aio_mnt->mnt_sb, &this);
-        if (!path.dentry) {
+        file = alloc_file_pseudo(inode, aio_mnt, "[aio]",
+                                O_RDWR, &aio_ring_fops);
+        if (IS_ERR(file))
                 iput(inode);
-                return ERR_PTR(-ENOMEM);
-        }
-        path.mnt = mntget(aio_mnt);
-
-        d_instantiate(path.dentry, inode);
-        file = alloc_file(&path, FMODE_READ | FMODE_WRITE, &aio_ring_fops);
-        if (IS_ERR(file)) {
-                path_put(&path);
-                return file;
-        }
-
-        file->f_flags = O_RDWR;
         return file;
 }
 
 static struct dentry *aio_mount(struct file_system_type *fs_type,
                                 int flags, const char *dev_name, void *data)
 {
-        static const struct dentry_operations ops = {
-                .d_dname        = simple_dname,
-        };
-        struct dentry *root = mount_pseudo(fs_type, "aio:", NULL, &ops,
+        struct dentry *root = mount_pseudo(fs_type, "aio:", NULL, NULL,
                                            AIO_RING_MAGIC);
 
         if (!IS_ERR(root))