Commit 59b11946 authored by Hugh Dickins's avatar Hugh Dickins Committed by Liu Shixin
Browse files

shmem: remove vma arg from shmem_get_folio_gfp() 

mainline inclusion
from mainline-v6.7-rc1
commit e3e1a5067fd2f1b3f4f7c651f5b33082962d1aa1
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAIHPC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e3e1a5067fd2f1b3f4f7c651f5b33082962d1aa1

--------------------------------

The vma is already there in vmf->vma, so no need for a separate arg.

Link: https://lkml.kernel.org/r/d9ce6f65-a2ed-48f4-4299-fdb0544875c5@google.com


Signed-off-by: default avatarHugh Dickins <hughd@google.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Cc: Axel Rasmussen <axelrasmussen@google.com>
Cc: Carlos Maiolino <cem@kernel.org>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Darrick J. Wong <djwong@kernel.org>
Cc: Dave Chinner <dchinner@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Tim Chen <tim.c.chen@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
parent 9a6c25fa

mm/shmem.c

+6 −7
Original line number Diff line number Diff line
@@ -1952,14 +1952,13 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, 
 * vm. If we swap it in we mark it dirty since we also free the swap

 * entry since a page cannot live in both the swap and page cache.

 *

 * vma, vmf, and fault_type are only supplied by shmem_fault:

 * otherwise they are NULL.

 * vmf and fault_type are only supplied by shmem_fault: otherwise they are NULL.

 */

static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index,

		struct folio **foliop, enum sgp_type sgp, gfp_t gfp,

		struct vm_area_struct *vma, struct vm_fault *vmf,

		vm_fault_t *fault_type)

		struct vm_fault *vmf, vm_fault_t *fault_type)

{

	struct vm_area_struct *vma = vmf ? vmf->vma : NULL;

	struct address_space *mapping = inode->i_mapping;

	struct shmem_inode_info *info = SHMEM_I(inode);

	struct shmem_sb_info *sbinfo;
@@ -2174,7 +2173,7 @@ int shmem_get_folio(struct inode *inode, pgoff_t index, struct folio **foliop, 
		enum sgp_type sgp)

{

	return shmem_get_folio_gfp(inode, index, foliop, sgp,

			mapping_gfp_mask(inode->i_mapping), NULL, NULL, NULL);

			mapping_gfp_mask(inode->i_mapping), NULL, NULL);

}



/*
@@ -2258,7 +2257,7 @@ static vm_fault_t shmem_fault(struct vm_fault *vmf) 
	}



	err = shmem_get_folio_gfp(inode, vmf->pgoff, &folio, SGP_CACHE,

				  gfp, vma, vmf, &ret);

				  gfp, vmf, &ret);

	if (err)

		return vmf_error(err);

	if (folio)
@@ -4933,7 +4932,7 @@ struct folio *shmem_read_folio_gfp(struct address_space *mapping, 


	BUG_ON(!shmem_mapping(mapping));

	error = shmem_get_folio_gfp(inode, index, &folio, SGP_CACHE,

				  gfp, NULL, NULL, NULL);

				    gfp, NULL, NULL);

	if (error)

		return ERR_PTR(error);