* [PATCH] mm: Delete find_get_entries_tag
@ 2019-04-30 15:29 Matthew Wilcox
2019-04-30 15:35 ` Matthew Wilcox
2019-04-30 16:28 ` Ross Zwisler
0 siblings, 2 replies; 3+ messages in thread
From: Matthew Wilcox @ 2019-04-30 15:29 UTC (permalink / raw)
To: zwisler, akpm, linux-mm; +Cc: Matthew Wilcox (Oracle)
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
I removed the only user of this and hadn't noticed it was now unused.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
include/linux/pagemap.h | 3 --
mm/filemap.c | 66 -----------------------------------------
2 files changed, 69 deletions(-)
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index bcf909d0de5f..36973264a767 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -360,9 +360,6 @@ static inline unsigned find_get_pages_tag(struct address_space *mapping,
return find_get_pages_range_tag(mapping, index, (pgoff_t)-1, tag,
nr_pages, pages);
}
-unsigned find_get_entries_tag(struct address_space *mapping, pgoff_t start,
- xa_mark_t tag, unsigned int nr_entries,
- struct page **entries, pgoff_t *indices);
struct page *grab_cache_page_write_begin(struct address_space *mapping,
pgoff_t index, unsigned flags);
diff --git a/mm/filemap.c b/mm/filemap.c
index d78f577baef2..f052ebe95946 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1964,72 +1964,6 @@ unsigned find_get_pages_range_tag(struct address_space *mapping, pgoff_t *index,
}
EXPORT_SYMBOL(find_get_pages_range_tag);
-/**
- * find_get_entries_tag - find and return entries that match @tag
- * @mapping: the address_space to search
- * @start: the starting page cache index
- * @tag: the tag index
- * @nr_entries: the maximum number of entries
- * @entries: where the resulting entries are placed
- * @indices: the cache indices corresponding to the entries in @entries
- *
- * Like find_get_entries, except we only return entries which are tagged with
- * @tag.
- *
- * Return: the number of entries which were found.
- */
-unsigned find_get_entries_tag(struct address_space *mapping, pgoff_t start,
- xa_mark_t tag, unsigned int nr_entries,
- struct page **entries, pgoff_t *indices)
-{
- XA_STATE(xas, &mapping->i_pages, start);
- struct page *page;
- unsigned int ret = 0;
-
- if (!nr_entries)
- return 0;
-
- rcu_read_lock();
- xas_for_each_marked(&xas, page, ULONG_MAX, tag) {
- struct page *head;
- if (xas_retry(&xas, page))
- continue;
- /*
- * A shadow entry of a recently evicted page, a swap
- * entry from shmem/tmpfs or a DAX entry. Return it
- * without attempting to raise page count.
- */
- if (xa_is_value(page))
- goto export;
-
- head = compound_head(page);
- if (!page_cache_get_speculative(head))
- goto retry;
-
- /* The page was split under us? */
- if (compound_head(page) != head)
- goto put_page;
-
- /* Has the page moved? */
- if (unlikely(page != xas_reload(&xas)))
- goto put_page;
-
-export:
- indices[ret] = xas.xa_index;
- entries[ret] = page;
- if (++ret == nr_entries)
- break;
- continue;
-put_page:
- put_page(head);
-retry:
- xas_reset(&xas);
- }
- rcu_read_unlock();
- return ret;
-}
-EXPORT_SYMBOL(find_get_entries_tag);
-
/*
* CD/DVDs are error prone. When a medium error occurs, the driver may fail
* a _large_ part of the i/o request. Imagine the worst scenario:
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mm: Delete find_get_entries_tag
2019-04-30 15:29 [PATCH] mm: Delete find_get_entries_tag Matthew Wilcox
@ 2019-04-30 15:35 ` Matthew Wilcox
2019-04-30 16:28 ` Ross Zwisler
1 sibling, 0 replies; 3+ messages in thread
From: Matthew Wilcox @ 2019-04-30 15:35 UTC (permalink / raw)
To: zwisler, akpm, linux-mm
On Tue, Apr 30, 2019 at 08:29:29AM -0700, Matthew Wilcox wrote:
> From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
>
> I removed the only user of this and hadn't noticed it was now unused.
This is based on Linus' latest, and I know there's a patch in the akpm
tree from me which modifies find_get_entries_tag(). This should be a
relatively trivial conflict to fix.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mm: Delete find_get_entries_tag
2019-04-30 15:29 [PATCH] mm: Delete find_get_entries_tag Matthew Wilcox
2019-04-30 15:35 ` Matthew Wilcox
@ 2019-04-30 16:28 ` Ross Zwisler
1 sibling, 0 replies; 3+ messages in thread
From: Ross Zwisler @ 2019-04-30 16:28 UTC (permalink / raw)
To: Matthew Wilcox; +Cc: Andrew Morton, Linux MM
On Tue, Apr 30, 2019 at 9:29 AM Matthew Wilcox <willy@infradead.org> wrote:
> From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
>
> I removed the only user of this and hadn't noticed it was now unused.
>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Ross Zwisler <zwisler@google.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-30 16:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-30 15:29 [PATCH] mm: Delete find_get_entries_tag Matthew Wilcox
2019-04-30 15:35 ` Matthew Wilcox
2019-04-30 16:28 ` Ross Zwisler
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).