shmem: shmem_acct_blocks() and shmem_inode_acct_blocks()
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: Hugh Dickins <hughd@google.com> Reviewed-by: Jan 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: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
9be7d5b066
commit
4199f51a7e
14
mm/shmem.c
14
mm/shmem.c
|
@ -189,10 +189,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;
|
||||
|
@ -207,13 +207,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 */
|
||||
|
@ -447,7 +447,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 */
|
||||
|
@ -1671,7 +1671,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;
|
||||
|
||||
|
@ -2572,7 +2572,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
|
||||
|
|
Loading…
Reference in New Issue