| Message ID | 20220214200017.3150590-10-willy@infradead.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Various fixes around invalidate_page() | expand |
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
On 2022/2/15 4:00, Matthew Wilcox (Oracle) wrote: > 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: Matthew Wilcox (Oracle) <willy@infradead.org> LGTM. Thanks. Reviewed-by: Miaohe Lin <linmiaohe@huawei.com> > --- > include/linux/fs.h | 4 ---- > mm/internal.h | 2 ++ > mm/truncate.c | 32 +++++++++++++------------------- > 3 files changed, 15 insertions(+), 23 deletions(-) > > diff --git a/include/linux/fs.h b/include/linux/fs.h > index e2d892b201b0..85c584c5c623 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -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) || > diff --git a/mm/internal.h b/mm/internal.h > index d886b87b1294..6bbe40a1880a 100644 > --- a/mm/internal.h > +++ b/mm/internal.h > @@ -102,6 +102,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. > diff --git a/mm/truncate.c b/mm/truncate.c > index 14486e75ec28..6b94b00f4307 100644 > --- a/mm/truncate.c > +++ b/mm/truncate.c > @@ -492,7 +492,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]; > @@ -557,27 +568,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 >
diff --git a/include/linux/fs.h b/include/linux/fs.h index e2d892b201b0..85c584c5c623 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -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) || diff --git a/mm/internal.h b/mm/internal.h index d886b87b1294..6bbe40a1880a 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -102,6 +102,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. diff --git a/mm/truncate.c b/mm/truncate.c index 14486e75ec28..6b94b00f4307 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -492,7 +492,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]; @@ -557,27 +568,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
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: Matthew Wilcox (Oracle) <willy@infradead.org> --- include/linux/fs.h | 4 ---- mm/internal.h | 2 ++ mm/truncate.c | 32 +++++++++++++------------------- 3 files changed, 15 insertions(+), 23 deletions(-)