Commit 590d356a authored by Lorenzo Stoakes's avatar Lorenzo Stoakes Committed by Andrew Morton
Browse files

mm: update shmem_[kernel]_file_*() functions to use vma_flags_t 

In order to be able to use only vma_flags_t in vm_area_desc we must adjust
shmem file setup functions to operate in terms of vma_flags_t rather than
vm_flags_t.

This patch makes this change and updates all callers to use the new
functions.

No functional changes intended.

[akpm@linux-foundation.org: comment fixes, per Baolin]
Link: https://lkml.kernel.org/r/736febd280eb484d79cef5cf55b8a6f79ad832d2.1769097829.git.lorenzo.stoakes@oracle.com


Signed-off-by: default avatarLorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Reviewed-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Cc: Barry Song <baohua@kernel.org>
Cc: David Hildenbrand <david@kernel.org>
Cc: Dev Jain <dev.jain@arm.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Zi Yan <ziy@nvidia.com>
Cc: "Darrick J. Wong" <djwong@kernel.org>
Cc: Damien Le Moal <dlemoal@kernel.org>
Cc: Yury Norov <ynorov@nvidia.com>
Cc: Chris Mason <clm@fb.com>
Cc: Pedro Falcato <pfalcato@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent fd3196ee

arch/x86/kernel/cpu/sgx/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int sgx_encl_create(struct sgx_encl *encl, struct sgx_secs *secs) 
	encl_size = secs->size + PAGE_SIZE;



	backing = shmem_file_setup("SGX backing", encl_size + (encl_size >> 5),

				   VM_NORESERVE);

				   mk_vma_flags(VMA_NORESERVE_BIT));

	if (IS_ERR(backing)) {

		ret = PTR_ERR(backing);

		goto err_out_shrink;

drivers/gpu/drm/drm_gem.c

+3 −2
Original line number Diff line number Diff line
@@ -130,14 +130,15 @@ int drm_gem_object_init_with_mnt(struct drm_device *dev, 
				 struct vfsmount *gemfs)

{

	struct file *filp;

	const vma_flags_t flags = mk_vma_flags(VMA_NORESERVE_BIT);



	drm_gem_private_object_init(dev, obj, size);



	if (gemfs)

		filp = shmem_file_setup_with_mnt(gemfs, "drm mm object", size,

						 VM_NORESERVE);

						 flags);

	else

		filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);

		filp = shmem_file_setup("drm mm object", size, flags);



	if (IS_ERR(filp))

		return PTR_ERR(filp);

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

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ static int __create_shmem(struct drm_i915_private *i915, 
			  struct drm_gem_object *obj,

			  resource_size_t size)

{

	unsigned long flags = VM_NORESERVE;

	const vma_flags_t flags = mk_vma_flags(VMA_NORESERVE_BIT);

	struct file *filp;



	drm_gem_private_object_init(&i915->drm, obj, size);

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

+2 −1
Original line number Diff line number Diff line
@@ -200,7 +200,8 @@ static int i915_ttm_tt_shmem_populate(struct ttm_device *bdev, 
		struct address_space *mapping;

		gfp_t mask;



		filp = shmem_file_setup("i915-shmem-tt", size, VM_NORESERVE);

		filp = shmem_file_setup("i915-shmem-tt", size,

					mk_vma_flags(VMA_NORESERVE_BIT));

		if (IS_ERR(filp))

			return PTR_ERR(filp);

drivers/gpu/drm/i915/gt/shmem_utils.c

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ struct file *shmem_create_from_data(const char *name, void *data, size_t len) 
	struct file *file;

	int err;



	file = shmem_file_setup(name, PAGE_ALIGN(len), VM_NORESERVE);

	file = shmem_file_setup(name, PAGE_ALIGN(len),

				mk_vma_flags(VMA_NORESERVE_BIT));

	if (IS_ERR(file))

		return file;