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

Pull vfs fixes from Al Viro:
 "Fix several places that screw up cleanups after failures halfway
  through opening a file (one open-coding filp_clone_open() and getting
  it wrong, two misusing alloc_file()). That part is -stable fodder from
  the 'work.open' branch.

  And Christoph's regression fix for uapi breakage in aio series;
  include/uapi/linux/aio_abi.h shouldn't be pulling in the kernel
  definition of sigset_t, the reason for doing so in the first place had
  been bogus - there's no need to expose struct __aio_sigset in
  aio_abi.h at all"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  aio: don't expose __aio_sigset in uapi
  ocxlflash_getfile(): fix double-iput() on alloc_file() failures
  cxl_getfile(): fix double-iput() on alloc_file() failures
  drm_mode_create_lease_ioctl(): fix open-coded filp_clone_open()

1 files changed, 1 insertions, 15 deletions

diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c
index 50c73c0a20b9..d638c0fb3418 100644
--- a/drivers/gpu/drm/drm_lease.c
+++ b/drivers/gpu/drm/drm_lease.c
@@ -553,24 +553,13 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev,
 
         /* Clone the lessor file to create a new file for us */
         DRM_DEBUG_LEASE("Allocating lease file\n");
-        path_get(&lessor_file->f_path);
-        lessee_file = alloc_file(&lessor_file->f_path,
-                                 lessor_file->f_mode,
-                                 fops_get(lessor_file->f_inode->i_fop));
-
+        lessee_file = filp_clone_open(lessor_file);
         if (IS_ERR(lessee_file)) {
                 ret = PTR_ERR(lessee_file);
                 goto out_lessee;
         }
 
-        /* Initialize the new file for DRM */
-        DRM_DEBUG_LEASE("Initializing the file with %p\n", lessee_file->f_op->open);
-        ret = lessee_file->f_op->open(lessee_file->f_inode, lessee_file);
-        if (ret)
-                goto out_lessee_file;
-
         lessee_priv = lessee_file->private_data;
-
         /* Change the file to a master one */
         drm_master_put(&lessee_priv->master);
         lessee_priv->master = lessee;
@@ -588,9 +577,6 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev,
         DRM_DEBUG_LEASE("drm_mode_create_lease_ioctl succeeded\n");
         return 0;
 
-out_lessee_file:
-        fput(lessee_file);
-
 out_lessee:
         drm_master_put(&lessee);