From: Miaohe Lin <linmiaohe@huawei.com>
To: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
<linux-fsdevel@vger.kernel.org>, <linux-mm@kvack.org>
Subject: Re: [PATCH 09/10] mm/truncate: Combine invalidate_mapping_pagevec() and __invalidate_mapping_pages()
Date: Tue, 15 Feb 2022 17:37:49 +0800 [thread overview]
Message-ID: <54cc232e-9eb9-efbf-2f93-e23cfa3d6c36@huawei.com> (raw)
In-Reply-To: <20220214200017.3150590-10-willy@infradead.org>
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
>
next prev parent reply other threads:[~2022-02-15 9:37 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-14 20:00 [PATCH 00/10] Various fixes around invalidate_page() Matthew Wilcox (Oracle)
2022-02-14 20:00 ` [PATCH 01/10] splice: Use a folio in page_cache_pipe_buf_try_steal() Matthew Wilcox (Oracle)
2022-02-15 7:15 ` Christoph Hellwig
2022-02-15 8:32 ` Miaohe Lin
2022-02-14 20:00 ` [PATCH 02/10] mm/truncate: Inline invalidate_complete_page() into its one caller Matthew Wilcox (Oracle)
2022-02-14 23:09 ` John Hubbard
2022-02-14 23:32 ` Matthew Wilcox
2022-02-14 23:51 ` John Hubbard
2022-02-15 7:17 ` Christoph Hellwig
2022-02-15 7:45 ` Miaohe Lin
2022-02-15 20:09 ` Matthew Wilcox
2022-02-16 2:36 ` Miaohe Lin
2022-02-16 2:45 ` Miaohe Lin
2022-02-14 20:00 ` [PATCH 03/10] mm/truncate: Convert invalidate_inode_page() to use a folio Matthew Wilcox (Oracle)
2022-02-15 7:18 ` Christoph Hellwig
2022-02-15 8:32 ` Miaohe Lin
2022-02-14 20:00 ` [PATCH 04/10] mm/truncate: Replace page_mapped() call in invalidate_inode_page() Matthew Wilcox (Oracle)
2022-02-15 7:19 ` Christoph Hellwig
2022-02-15 20:12 ` Matthew Wilcox
2022-02-15 8:32 ` Miaohe Lin
2022-02-25 1:31 ` Matthew Wilcox
2022-02-25 3:27 ` Matthew Wilcox
2022-02-14 20:00 ` [PATCH 05/10] mm: Convert remove_mapping() to take a folio Matthew Wilcox (Oracle)
2022-02-15 7:21 ` Christoph Hellwig
2022-02-15 8:33 ` Miaohe Lin
2022-02-14 20:00 ` [PATCH 06/10] mm/truncate: Split invalidate_inode_page() into mapping_shrink_folio() Matthew Wilcox (Oracle)
2022-02-15 7:23 ` Christoph Hellwig
2022-02-15 9:37 ` Miaohe Lin
2022-02-14 20:00 ` [PATCH 07/10] mm/truncate: Convert __invalidate_mapping_pages() to use a folio Matthew Wilcox (Oracle)
2022-02-15 7:24 ` Christoph Hellwig
2022-02-15 9:37 ` Miaohe Lin
2022-02-14 20:00 ` [PATCH 08/10] mm: Turn deactivate_file_page() into deactivate_file_folio() Matthew Wilcox (Oracle)
2022-02-15 7:25 ` Christoph Hellwig
2022-02-15 8:26 ` Miaohe Lin
2022-02-15 20:33 ` Matthew Wilcox
2022-02-16 2:45 ` Miaohe Lin
2022-02-14 20:00 ` [PATCH 09/10] mm/truncate: Combine invalidate_mapping_pagevec() and __invalidate_mapping_pages() Matthew Wilcox (Oracle)
2022-02-15 7:26 ` Christoph Hellwig
2022-02-15 9:37 ` Miaohe Lin [this message]
2022-02-14 20:00 ` [PATCH 10/10] fs: Move many prototypes to pagemap.h Matthew Wilcox (Oracle)
2022-02-15 7:27 ` Christoph Hellwig
2022-02-15 9:38 ` Miaohe Lin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54cc232e-9eb9-efbf-2f93-e23cfa3d6c36@huawei.com \
--to=linmiaohe@huawei.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).