From: Christoph Hellwig <hch@lst.de> To: Andrew Morton <akpm@linux-foundation.org>, Matthew Wilcox <willy@infradead.org>, Hugh Dickins <hughd@google.com> Cc: linux-afs@lists.infradead.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, cluster-devel@redhat.com, linux-mm@kvack.org, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-nilfs@vger.kernel.org Subject: [PATCH 2/7] mm: make mapping_get_entry available outside of filemap.c Date: Sat, 21 Jan 2023 07:57:50 +0100 [thread overview] Message-ID: <20230121065755.1140136-3-hch@lst.de> (raw) In-Reply-To: <20230121065755.1140136-1-hch@lst.de> mapping_get_entry is useful for page cache API users that need to know about xa_value internals. Rename it and make it available in pagemap.h. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- include/linux/pagemap.h | 1 + mm/filemap.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 9f108168377195..24dedf6b12be49 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -507,6 +507,7 @@ pgoff_t page_cache_prev_miss(struct address_space *mapping, #define FGP_ENTRY 0x00000080 #define FGP_STABLE 0x00000100 +void *filemap_get_entry(struct address_space *mapping, pgoff_t index); struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, int fgp_flags, gfp_t gfp); struct page *pagecache_get_page(struct address_space *mapping, pgoff_t index, diff --git a/mm/filemap.c b/mm/filemap.c index c915ded191f03f..ed0583f9e27512 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1834,7 +1834,7 @@ EXPORT_SYMBOL(page_cache_prev_miss); */ /* - * mapping_get_entry - Get a page cache entry. + * filemap_get_entry - Get a page cache entry. * @mapping: the address_space to search * @index: The page cache index. * @@ -1845,7 +1845,7 @@ EXPORT_SYMBOL(page_cache_prev_miss); * * Return: The folio, swap or shadow entry, %NULL if nothing is found. */ -static void *mapping_get_entry(struct address_space *mapping, pgoff_t index) +void *filemap_get_entry(struct address_space *mapping, pgoff_t index) { XA_STATE(xas, &mapping->i_pages, index); struct folio *folio; @@ -1915,7 +1915,7 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, struct folio *folio; repeat: - folio = mapping_get_entry(mapping, index); + folio = filemap_get_entry(mapping, index); if (xa_is_value(folio)) { if (fgp_flags & FGP_ENTRY) return folio; -- 2.39.0
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: cluster-devel.redhat.com Subject: [Cluster-devel] [PATCH 2/7] mm: make mapping_get_entry available outside of filemap.c Date: Sat, 21 Jan 2023 07:57:50 +0100 [thread overview] Message-ID: <20230121065755.1140136-3-hch@lst.de> (raw) In-Reply-To: <20230121065755.1140136-1-hch@lst.de> mapping_get_entry is useful for page cache API users that need to know about xa_value internals. Rename it and make it available in pagemap.h. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- include/linux/pagemap.h | 1 + mm/filemap.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 9f108168377195..24dedf6b12be49 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -507,6 +507,7 @@ pgoff_t page_cache_prev_miss(struct address_space *mapping, #define FGP_ENTRY 0x00000080 #define FGP_STABLE 0x00000100 +void *filemap_get_entry(struct address_space *mapping, pgoff_t index); struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, int fgp_flags, gfp_t gfp); struct page *pagecache_get_page(struct address_space *mapping, pgoff_t index, diff --git a/mm/filemap.c b/mm/filemap.c index c915ded191f03f..ed0583f9e27512 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1834,7 +1834,7 @@ EXPORT_SYMBOL(page_cache_prev_miss); */ /* - * mapping_get_entry - Get a page cache entry. + * filemap_get_entry - Get a page cache entry. * @mapping: the address_space to search * @index: The page cache index. * @@ -1845,7 +1845,7 @@ EXPORT_SYMBOL(page_cache_prev_miss); * * Return: The folio, swap or shadow entry, %NULL if nothing is found. */ -static void *mapping_get_entry(struct address_space *mapping, pgoff_t index) +void *filemap_get_entry(struct address_space *mapping, pgoff_t index) { XA_STATE(xas, &mapping->i_pages, index); struct folio *folio; @@ -1915,7 +1915,7 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, struct folio *folio; repeat: - folio = mapping_get_entry(mapping, index); + folio = filemap_get_entry(mapping, index); if (xa_is_value(folio)) { if (fgp_flags & FGP_ENTRY) return folio; -- 2.39.0
next prev parent reply other threads:[~2023-01-21 6:58 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-01-21 6:57 return an ERR_PTR from __filemap_get_folio v2 Christoph Hellwig 2023-01-21 6:57 ` Christoph Hellwig 2023-01-21 6:57 ` [Cluster-devel] " Christoph Hellwig 2023-01-21 6:57 ` [PATCH 1/7] mm: don't look at xarray value entries in split_huge_pages_in_file Christoph Hellwig 2023-01-21 6:57 ` [Cluster-devel] " Christoph Hellwig 2023-01-21 6:57 ` Christoph Hellwig [this message] 2023-01-21 6:57 ` [Cluster-devel] [PATCH 2/7] mm: make mapping_get_entry available outside of filemap.c Christoph Hellwig 2023-01-21 6:57 ` [PATCH 3/7] mm: use filemap_get_entry in filemap_get_incore_folio Christoph Hellwig 2023-01-21 6:57 ` Christoph Hellwig 2023-01-21 6:57 ` [Cluster-devel] " Christoph Hellwig 2023-01-21 6:57 ` [PATCH 4/7] shmem: remove shmem_get_partial_folio Christoph Hellwig 2023-01-21 6:57 ` [Cluster-devel] " Christoph Hellwig 2023-01-21 6:57 ` [PATCH 5/7] shmem: open code the page cache lookup in shmem_get_folio_gfp Christoph Hellwig 2023-01-21 6:57 ` Christoph Hellwig 2023-01-21 6:57 ` [Cluster-devel] " Christoph Hellwig 2023-01-21 6:57 ` [PATCH 6/7] mm: remove FGP_ENTRY Christoph Hellwig 2023-01-21 6:57 ` [Cluster-devel] " Christoph Hellwig 2023-01-21 6:57 ` [PATCH 7/7] mm: return an ERR_PTR from __filemap_get_folio Christoph Hellwig 2023-01-21 6:57 ` [Cluster-devel] " Christoph Hellwig 2023-01-21 11:52 ` kernel test robot 2023-01-21 11:52 ` kernel test robot 2023-01-21 11:52 ` [Cluster-devel] " kernel test robot 2023-01-21 14:28 ` Christoph Hellwig 2023-01-21 14:28 ` [Cluster-devel] " Christoph Hellwig 2023-01-23 15:44 ` David Sterba 2023-01-23 15:44 ` [Cluster-devel] " David Sterba 2023-01-26 17:24 ` Ryusuke Konishi 2023-01-26 17:24 ` Ryusuke Konishi 2023-01-26 17:24 ` [Cluster-devel] " Ryusuke Konishi 2023-03-10 4:31 ` Naoya Horiguchi 2023-03-10 4:31 ` [Cluster-devel] " Naoya Horiguchi 2023-03-10 7:00 ` Christoph Hellwig 2023-03-10 7:00 ` Christoph Hellwig 2023-03-10 7:00 ` [Cluster-devel] " Christoph Hellwig 2023-03-10 8:02 ` Naoya Horiguchi 2023-03-10 8:02 ` [Cluster-devel] " Naoya Horiguchi 2023-01-22 1:06 ` return an ERR_PTR from __filemap_get_folio v2 Andrew Morton 2023-01-22 1:06 ` Andrew Morton 2023-01-22 1:06 ` [Cluster-devel] " Andrew Morton 2023-01-22 7:20 ` Christoph Hellwig 2023-01-22 7:20 ` Christoph Hellwig 2023-01-22 7:20 ` [Cluster-devel] " Christoph Hellwig 2023-01-23 18:59 ` Andrew Morton 2023-01-23 18:59 ` Andrew Morton 2023-01-23 18:59 ` [Cluster-devel] " Andrew Morton 2023-01-23 19:18 ` Christoph Hellwig 2023-01-23 19:18 ` Christoph Hellwig 2023-01-23 19:18 ` [Cluster-devel] " Christoph Hellwig 2023-03-28 23:04 ` Andrew Morton 2023-03-28 23:04 ` [Cluster-devel] " Andrew Morton 2023-03-29 23:56 ` Christoph Hellwig 2023-03-29 23:56 ` Christoph Hellwig 2023-03-29 23:56 ` [Cluster-devel] " Christoph Hellwig 2023-03-07 14:34 return an ERR_PTR from __filemap_get_folio v3 Christoph Hellwig 2023-03-07 14:34 ` [PATCH 2/7] mm: make mapping_get_entry available outside of filemap.c Christoph Hellwig 2023-03-07 14:34 ` Christoph Hellwig
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=20230121065755.1140136-3-hch@lst.de \ --to=hch@lst.de \ --cc=akpm@linux-foundation.org \ --cc=cluster-devel@redhat.com \ --cc=hughd@google.com \ --cc=linux-afs@lists.infradead.org \ --cc=linux-btrfs@vger.kernel.org \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-nilfs@vger.kernel.org \ --cc=linux-xfs@vger.kernel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.