Commit e40b0b56 authored by Christian König's avatar Christian König
Browse files

Revert "mm: introduce vma_set_file function v4" 



The kernel test robot is not happy with that.

This reverts commit 2b5b95b1.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/394773/
parent 00efd65a

drivers/dma-buf/dma-buf.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/etnaviv/etnaviv_gem.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/i915/gem/i915_gem_mman.c

+2 −3
Original line number Diff line number Diff line
@@ -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:

drivers/gpu/drm/msm/msm_gem.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE