Commit c56109dd authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

mm/truncate: Combine invalidate_mapping_pagevec() and __invalidate_mapping_pages() 



We can save a function call by combining these two functions, which
are identical except for the return value.  Also move the prototype
to mm/internal.h.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
parent 261b6840

include/linux/fs.h

+0 −4
Original line number Diff line number Diff line
@@ -2749,10 +2749,6 @@ extern bool is_bad_inode(struct inode *); 
unsigned long invalidate_mapping_pages(struct address_space *mapping,

					pgoff_t start, pgoff_t end);



void invalidate_mapping_pagevec(struct address_space *mapping,

				pgoff_t start, pgoff_t end,

				unsigned long *nr_pagevec);



static inline void invalidate_remote_inode(struct inode *inode)

{

	if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||

mm/internal.h

+2 −0
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ int truncate_inode_folio(struct address_space *mapping, struct folio *folio); 
bool truncate_inode_partial_folio(struct folio *folio, loff_t start,

		loff_t end);

long invalidate_inode_page(struct page *page);

unsigned long invalidate_mapping_pagevec(struct address_space *mapping,

		pgoff_t start, pgoff_t end, unsigned long *nr_pagevec);



/**

 * folio_evictable - Test whether a folio is evictable.

mm/truncate.c

+13 −19
Original line number Diff line number Diff line
@@ -494,7 +494,18 @@ void truncate_inode_pages_final(struct address_space *mapping) 
}

EXPORT_SYMBOL(truncate_inode_pages_final);



static unsigned long __invalidate_mapping_pages(struct address_space *mapping,

/**

 * invalidate_mapping_pagevec - Invalidate all the unlocked pages of one inode

 * @mapping: the address_space which holds the pages to invalidate

 * @start: the offset 'from' which to invalidate

 * @end: the offset 'to' which to invalidate (inclusive)

 * @nr_pagevec: invalidate failed page number for caller

 *

 * This helper is similar to invalidate_mapping_pages(), except that it accounts

 * for pages that are likely on a pagevec and counts them in @nr_pagevec, which

 * will be used by the caller.

 */

unsigned long invalidate_mapping_pagevec(struct address_space *mapping,

		pgoff_t start, pgoff_t end, unsigned long *nr_pagevec)

{

	pgoff_t indices[PAGEVEC_SIZE];
@@ -559,27 +570,10 @@ static unsigned long __invalidate_mapping_pages(struct address_space *mapping, 
unsigned long invalidate_mapping_pages(struct address_space *mapping,

		pgoff_t start, pgoff_t end)

{

	return __invalidate_mapping_pages(mapping, start, end, NULL);

	return invalidate_mapping_pagevec(mapping, start, end, NULL);

}

EXPORT_SYMBOL(invalidate_mapping_pages);



/**

 * invalidate_mapping_pagevec - Invalidate all the unlocked pages of one inode

 * @mapping: the address_space which holds the pages to invalidate

 * @start: the offset 'from' which to invalidate

 * @end: the offset 'to' which to invalidate (inclusive)

 * @nr_pagevec: invalidate failed page number for caller

 *

 * This helper is similar to invalidate_mapping_pages(), except that it accounts

 * for pages that are likely on a pagevec and counts them in @nr_pagevec, which

 * will be used by the caller.

 */

void invalidate_mapping_pagevec(struct address_space *mapping,

		pgoff_t start, pgoff_t end, unsigned long *nr_pagevec)

{

	__invalidate_mapping_pages(mapping, start, end, nr_pagevec);

}



/*

 * This is like invalidate_inode_page(), except it ignores the page's

 * refcount.  We do this because invalidate_inode_pages2() needs stronger