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

shmem: shmem_acct_blocks() and shmem_inode_acct_blocks() 

mainline inclusion
from mainline-v6.7-rc1
commit 4199f51a7eb2054d68964efbd8d39c68053a8714
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=4199f51a7eb2054d68964efbd8d39c68053a8714

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

By historical accident, shmem_acct_block() and shmem_inode_acct_block()
were never pluralized when the pages argument was added, despite their
complements being shmem_unacct_blocks() and shmem_inode_unacct_blocks()
all along.  It has been an irritation: fix their naming at last.

Link: https://lkml.kernel.org/r/9124094-e4ab-8be7-ef80-9a87bdc2e4fc@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 7ddd16e0

mm/shmem.c

+7 −7
Original line number Diff line number Diff line
@@ -190,10 +190,10 @@ static inline int shmem_reacct_size(unsigned long flags, 
/*

 * ... whereas tmpfs objects are accounted incrementally as

 * pages are allocated, in order to allow large sparse files.

 * shmem_get_folio reports shmem_acct_block failure as -ENOSPC not -ENOMEM,

 * shmem_get_folio reports shmem_acct_blocks failure as -ENOSPC not -ENOMEM,

 * so that a failure on a sparse tmpfs mapping will give SIGBUS not OOM.

 */

static inline int shmem_acct_block(unsigned long flags, long pages)

static inline int shmem_acct_blocks(unsigned long flags, long pages)

{

	if (!(flags & VM_NORESERVE))

		return 0;
@@ -208,13 +208,13 @@ static inline void shmem_unacct_blocks(unsigned long flags, long pages) 
		vm_unacct_memory(pages * VM_ACCT(PAGE_SIZE));

}



static int shmem_inode_acct_block(struct inode *inode, long pages)

static int shmem_inode_acct_blocks(struct inode *inode, long pages)

{

	struct shmem_inode_info *info = SHMEM_I(inode);

	struct shmem_sb_info *sbinfo = SHMEM_SB(inode->i_sb);

	int err = -ENOSPC;



	if (shmem_acct_block(info->flags, pages))

	if (shmem_acct_blocks(info->flags, pages))

		return err;



	might_sleep();	/* when quotas */
@@ -448,7 +448,7 @@ bool shmem_charge(struct inode *inode, long pages) 
{

	struct address_space *mapping = inode->i_mapping;



	if (shmem_inode_acct_block(inode, pages))

	if (shmem_inode_acct_blocks(inode, pages))

		return false;



	/* nrpages adjustment first, then shmem_recalc_inode() when balanced */
@@ -1696,7 +1696,7 @@ static struct folio *shmem_alloc_and_acct_folio(gfp_t gfp, struct inode *inode, 
		huge = false;

	nr = huge ? HPAGE_PMD_NR : 1;



	err = shmem_inode_acct_block(inode, nr);

	err = shmem_inode_acct_blocks(inode, nr);

	if (err)

		goto failed;
@@ -2605,7 +2605,7 @@ int shmem_mfill_atomic_pte(pmd_t *dst_pmd, 
	int ret;

	pgoff_t max_off;



	if (shmem_inode_acct_block(inode, 1)) {

	if (shmem_inode_acct_blocks(inode, 1)) {

		/*

		 * We may have got a page, returned -ENOENT triggering a retry,

		 * and now we find ourselves with -ENOMEM. Release the page, to