Skip to contentSkip to conversation

pagemap: Remove __readahead_folio()

PATCH New Joanne Koong 1 participant 1 message Jan 16

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pagemap: Remove __readahead_folio()

Commit 4ea907108a5c ("fuse: use iomap for readahead") removed the only external user of __readahead_folio().

__readahead_folio() can be removed, with the logic in it subsumed into the main readahead_folio() function.

---
 include/linux/pagemap.h | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)
include/linux/pagemap.h +9 -16
index 31a848485ad9..cde854c12642 100644
@@ -1419,7 +1419,15 @@ void page_cache_async_readahead(struct address_space *mapping,
 	page_cache_async_ra(&ractl, folio, req_count);
 }
 
-static inline struct folio *__readahead_folio(struct readahead_control *ractl)
+/**
+ * readahead_folio - Get the next folio to read.
+ * @ractl: The current readahead request.
+ *
+ * Context: The folio is locked.  The caller should unlock the folio once
+ * all I/O to that folio has completed.
+ * Return: A pointer to the next folio, or %NULL if we are done.
+ */
+static inline struct folio *readahead_folio(struct readahead_control *ractl)
 {
 	struct folio *folio;
 
@@ -1436,21 +1444,6 @@ static inline struct folio *__readahead_folio(struct readahead_control *ractl)
 	VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio);
 	ractl->_batch_count = folio_nr_pages(folio);
 
-	return folio;
-}
-
-/**
- * readahead_folio - Get the next folio to read.
- * @ractl: The current readahead request.
- *
- * Context: The folio is locked.  The caller should unlock the folio once
- * all I/O to that folio has completed.
- * Return: A pointer to the next folio, or %NULL if we are done.
- */
-static inline struct folio *readahead_folio(struct readahead_control *ractl)
-{
-	struct folio *folio = __readahead_folio(ractl);
-
 	if (folio)
 		folio_put(folio);
 	return folio;
Signature · 1 line
2.47.3