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 6/7] mm: remove FGP_ENTRY Date: Sat, 21 Jan 2023 07:57:54 +0100 [thread overview] Message-ID: <20230121065755.1140136-7-hch@lst.de> (raw) In-Reply-To: <20230121065755.1140136-1-hch@lst.de> FGP_ENTRY is unused now, so remove it. Signed-off-by: Christoph Hellwig <hch@lst.de> --- include/linux/pagemap.h | 3 +-- mm/filemap.c | 7 +------ mm/folio-compat.c | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 24dedf6b12be49..e2208ee36966ea 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -504,8 +504,7 @@ pgoff_t page_cache_prev_miss(struct address_space *mapping, #define FGP_NOFS 0x00000010 #define FGP_NOWAIT 0x00000020 #define FGP_FOR_MMAP 0x00000040 -#define FGP_ENTRY 0x00000080 -#define FGP_STABLE 0x00000100 +#define FGP_STABLE 0x00000080 void *filemap_get_entry(struct address_space *mapping, pgoff_t index); struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, diff --git a/mm/filemap.c b/mm/filemap.c index ed0583f9e27512..35baadd130795c 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1889,8 +1889,6 @@ void *filemap_get_entry(struct address_space *mapping, pgoff_t index) * * * %FGP_ACCESSED - The folio will be marked accessed. * * %FGP_LOCK - The folio is returned locked. - * * %FGP_ENTRY - If there is a shadow / swap / DAX entry, return it - * instead of allocating a new folio to replace it. * * %FGP_CREAT - If no page is present then a new page is allocated using * @gfp and added to the page cache and the VM's LRU list. * The page is returned locked and with an increased refcount. @@ -1916,11 +1914,8 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, repeat: folio = filemap_get_entry(mapping, index); - if (xa_is_value(folio)) { - if (fgp_flags & FGP_ENTRY) - return folio; + if (xa_is_value(folio)) folio = NULL; - } if (!folio) goto no_page; diff --git a/mm/folio-compat.c b/mm/folio-compat.c index 18c48b55792635..f3841b4977b68e 100644 --- a/mm/folio-compat.c +++ b/mm/folio-compat.c @@ -97,8 +97,8 @@ struct page *pagecache_get_page(struct address_space *mapping, pgoff_t index, struct folio *folio; folio = __filemap_get_folio(mapping, index, fgp_flags, gfp); - if (!folio || xa_is_value(folio)) - return &folio->page; + if (!folio) + return NULL; return folio_file_page(folio, index); } EXPORT_SYMBOL(pagecache_get_page); -- 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 6/7] mm: remove FGP_ENTRY Date: Sat, 21 Jan 2023 07:57:54 +0100 [thread overview] Message-ID: <20230121065755.1140136-7-hch@lst.de> (raw) In-Reply-To: <20230121065755.1140136-1-hch@lst.de> FGP_ENTRY is unused now, so remove it. Signed-off-by: Christoph Hellwig <hch@lst.de> --- include/linux/pagemap.h | 3 +-- mm/filemap.c | 7 +------ mm/folio-compat.c | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 24dedf6b12be49..e2208ee36966ea 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -504,8 +504,7 @@ pgoff_t page_cache_prev_miss(struct address_space *mapping, #define FGP_NOFS 0x00000010 #define FGP_NOWAIT 0x00000020 #define FGP_FOR_MMAP 0x00000040 -#define FGP_ENTRY 0x00000080 -#define FGP_STABLE 0x00000100 +#define FGP_STABLE 0x00000080 void *filemap_get_entry(struct address_space *mapping, pgoff_t index); struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, diff --git a/mm/filemap.c b/mm/filemap.c index ed0583f9e27512..35baadd130795c 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1889,8 +1889,6 @@ void *filemap_get_entry(struct address_space *mapping, pgoff_t index) * * * %FGP_ACCESSED - The folio will be marked accessed. * * %FGP_LOCK - The folio is returned locked. - * * %FGP_ENTRY - If there is a shadow / swap / DAX entry, return it - * instead of allocating a new folio to replace it. * * %FGP_CREAT - If no page is present then a new page is allocated using * @gfp and added to the page cache and the VM's LRU list. * The page is returned locked and with an increased refcount. @@ -1916,11 +1914,8 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, repeat: folio = filemap_get_entry(mapping, index); - if (xa_is_value(folio)) { - if (fgp_flags & FGP_ENTRY) - return folio; + if (xa_is_value(folio)) folio = NULL; - } if (!folio) goto no_page; diff --git a/mm/folio-compat.c b/mm/folio-compat.c index 18c48b55792635..f3841b4977b68e 100644 --- a/mm/folio-compat.c +++ b/mm/folio-compat.c @@ -97,8 +97,8 @@ struct page *pagecache_get_page(struct address_space *mapping, pgoff_t index, struct folio *folio; folio = __filemap_get_folio(mapping, index, fgp_flags, gfp); - if (!folio || xa_is_value(folio)) - return &folio->page; + if (!folio) + return NULL; return folio_file_page(folio, index); } EXPORT_SYMBOL(pagecache_get_page); -- 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 ` [PATCH 2/7] mm: make mapping_get_entry available outside of filemap.c Christoph Hellwig 2023-01-21 6:57 ` [Cluster-devel] " 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 ` Christoph Hellwig [this message] 2023-01-21 6:57 ` [Cluster-devel] [PATCH 6/7] mm: remove FGP_ENTRY 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 6/7] mm: remove FGP_ENTRY 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-7-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.