Revert "mm: introduce vma_set_file function v4"

The kernel test robot is not happy with that.

This reverts commit 2b5b95b1ff3d70a95013a45e3b5b90f1daf42348.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/394773/

diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index e63684d..282bd8b 100644 (file)
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -1183,7 +1183,8 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma,
                return -EINVAL;
 
        /* readjust the vma */
-       vma_set_file(vma, dmabuf->file);
+       fput(vma->vm_file);
+       vma->vm_file = get_file(dmabuf->file);
        vma->vm_pgoff = pgoff;
 
        return dmabuf->ops->mmap(dmabuf, vma);

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index 4132acf..67d9a2b 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -145,8 +145,10 @@ static int etnaviv_gem_mmap_obj(struct etnaviv_gem_object *etnaviv_obj,
                 * address_space (so unmap_mapping_range does what we want,
                 * in particular in the case of mmap'd dmabufs)
                 */
+               fput(vma->vm_file);
+               get_file(etnaviv_obj->base.filp);
                vma->vm_pgoff = 0;
-               vma_set_file(vma, etnaviv_obj->base.filp);
+               vma->vm_file  = etnaviv_obj->base.filp;
 
                vma->vm_page_prot = vm_page_prot;
        }

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
index 04e9c04..0dd477e 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
@@ -114,7 +114,8 @@ static int i915_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *
        if (ret)
                return ret;
 
-       vma_set_file(vma, obj->base.filp);
+       fput(vma->vm_file);
+       vma->vm_file = get_file(obj->base.filp);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
index ec28a6c..3d69e51 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
@@ -893,9 +893,8 @@ int i915_gem_mmap(struct file *filp, struct vm_area_struct *vma)
         * requires avoiding extraneous references to their filp, hence why
         * we prefer to use an anonymous file for their mmaps.
         */
-       vma_set_file(vma, anon);
-       /* Drop the initial creation reference, the vma is now holding one. */
-       fput(anon);
+       fput(vma->vm_file);
+       vma->vm_file = anon;
 
        switch (mmo->mmap_type) {
        case I915_MMAP_TYPE_WC:

diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 311721c..2e1bce7 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -212,8 +212,10 @@ int msm_gem_mmap_obj(struct drm_gem_object *obj,
                 * address_space (so unmap_mapping_range does what we want,
                 * in particular in the case of mmap'd dmabufs)
                 */
+               fput(vma->vm_file);
+               get_file(obj->filp);
                vma->vm_pgoff = 0;
-               vma_set_file(vma, obj->filp);
+               vma->vm_file  = obj->filp;
 
                vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
        }

diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index f063f5a..d8e0979 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -564,8 +564,9 @@ int omap_gem_mmap_obj(struct drm_gem_object *obj,
                 * address_space (so unmap_mapping_range does what we want,
                 * in particular in the case of mmap'd dmabufs)
                 */
+               fput(vma->vm_file);
                vma->vm_pgoff = 0;
-               vma_set_file(vma, obj->filp);
+               vma->vm_file  = get_file(obj->filp);
 
                vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
        }

diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
index ea0eeca..fa54a6d 100644 (file)
--- a/drivers/gpu/drm/vgem/vgem_drv.c
+++ b/drivers/gpu/drm/vgem/vgem_drv.c
@@ -397,7 +397,8 @@ static int vgem_prime_mmap(struct drm_gem_object *obj,
        if (ret)
                return ret;
 
-       vma_set_file(vma, obj->filp);
+       fput(vma->vm_file);
+       vma->vm_file = get_file(obj->filp);
        vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
        vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
 

diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
index 4789d36..10b4be1 100644 (file)
--- a/drivers/staging/android/ashmem.c
+++ b/drivers/staging/android/ashmem.c
@@ -450,9 +450,9 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma)
                vma_set_anonymous(vma);
        }
 
-       vma_set_file(vma, asma->file);
-       /* XXX: merge this with the get_file() above if possible */
-       fput(asma->file);
+       if (vma->vm_file)
+               fput(vma->vm_file);
+       vma->vm_file = asma->file;
 
 out:
        mutex_unlock(&ashmem_mutex);

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 2b7ac36..ef360fe 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2719,8 +2719,6 @@ static inline void vma_set_page_prot(struct vm_area_struct *vma)
 }
 #endif
 
-void vma_set_file(struct vm_area_struct *vma, struct file *file);
-
 #ifdef CONFIG_NUMA_BALANCING
 unsigned long change_prot_numa(struct vm_area_struct *vma,
                        unsigned long start, unsigned long end);

diff --git a/mm/mmap.c b/mm/mmap.c
index b0093cc..30a4e84 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -136,18 +136,6 @@ void vma_set_page_prot(struct vm_area_struct *vma)
        WRITE_ONCE(vma->vm_page_prot, vm_page_prot);
 }
 
-/*
- * Change backing file, only valid to use during initial VMA setup.
- */
-void vma_set_file(struct vm_area_struct *vma, struct file *file)
-{
-       /* Changing an anonymous vma with this is illegal */
-       get_file(file);
-       swap(vma->vm_file, file);
-       fput(file);
-}
-EXPORT_SYMBOL(vma_set_file);
-
 /*
  * Requires inode->i_mapping->i_mmap_rwsem
  */