[PATCH 22/25] mm: Add wait_on_folio_locked & wait_on_folio_locked_killable

From: Matthew Wilcox (Oracle)
Date: Wed Dec 16 2020 - 13:25:53 EST


Turn wait_on_page_locked() and wait_on_page_locked_killable() into
wrappers.

Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
---
include/linux/pagemap.h | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index ac4d3e2ac86c..22f9774d8a83 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -727,21 +727,29 @@ extern int wait_on_folio_bit_killable(struct folio *folio, int bit_nr);
* ie with increased "page->count" so that the page won't
* go away during the wait..
*/
-static inline void wait_on_page_locked(struct page *page)
+static inline void wait_on_folio_locked(struct folio *folio)
{
- struct folio *folio = page_folio(page);
if (FolioLocked(folio))
wait_on_folio_bit(folio, PG_locked);
}

-static inline int wait_on_page_locked_killable(struct page *page)
+static inline int wait_on_folio_locked_killable(struct folio *folio)
{
- struct folio *folio = page_folio(page);
if (!FolioLocked(folio))
return 0;
return wait_on_folio_bit_killable(folio, PG_locked);
}

+static inline void wait_on_page_locked(struct page *page)
+{
+ wait_on_folio_locked(page_folio(page));
+}
+
+static inline int wait_on_page_locked_killable(struct page *page)
+{
+ return wait_on_folio_locked_killable(page_folio(page));
+}
+
extern void put_and_wait_on_page_locked(struct page *page);

void wait_on_page_writeback(struct page *page);
--
2.29.2