Commit 6974d7c9 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

mm/filemap: Add folio_wake_bit() 



Convert wake_up_page_bit() to folio_wake_bit().  All callers have a folio,
so use it directly.  Saves 66 bytes of text in end_page_private_2().

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarJeff Layton <jlayton@kernel.org>
Acked-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Reviewed-by: default avatarWilliam Kucharski <william.kucharski@oracle.com>
Reviewed-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarMike Rapoport <rppt@linux.ibm.com>
parent 101c0bf6

mm/filemap.c

+12 −11
Original line number Diff line number Diff line
@@ -1176,14 +1176,14 @@ static int wake_page_function(wait_queue_entry_t *wait, unsigned mode, int sync, 
	return (flags & WQ_FLAG_EXCLUSIVE) != 0;

}



static void wake_up_page_bit(struct page *page, int bit_nr)

static void folio_wake_bit(struct folio *folio, int bit_nr)

{

	wait_queue_head_t *q = page_waitqueue(page);

	wait_queue_head_t *q = page_waitqueue(&folio->page);

	struct wait_page_key key;

	unsigned long flags;

	wait_queue_entry_t bookmark;



	key.page = page;

	key.page = &folio->page;

	key.bit_nr = bit_nr;

	key.page_match = 0;
@@ -1218,7 +1218,7 @@ static void wake_up_page_bit(struct page *page, int bit_nr) 
	 * page waiters.

	 */

	if (!waitqueue_active(q) || !key.page_match) {

		ClearPageWaiters(page);

		folio_clear_waiters(folio);

		/*

		 * It's possible to miss clearing Waiters here, when we woke

		 * our page waiters, but the hashed waitqueue has waiters for
@@ -1234,7 +1234,7 @@ static void folio_wake(struct folio *folio, int bit) 
{

	if (!folio_test_waiters(folio))

		return;

	wake_up_page_bit(&folio->page, bit);

	folio_wake_bit(folio, bit);

}



/*
@@ -1501,7 +1501,7 @@ void folio_unlock(struct folio *folio) 
	BUILD_BUG_ON(PG_locked > 7);

	VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio);

	if (clear_bit_unlock_is_negative_byte(PG_locked, folio_flags(folio, 0)))

		wake_up_page_bit(&folio->page, PG_locked);

		folio_wake_bit(folio, PG_locked);

}

EXPORT_SYMBOL(folio_unlock);
@@ -1518,11 +1518,12 @@ EXPORT_SYMBOL(folio_unlock); 
 */

void end_page_private_2(struct page *page)

{

	page = compound_head(page);

	VM_BUG_ON_PAGE(!PagePrivate2(page), page);

	clear_bit_unlock(PG_private_2, &page->flags);

	wake_up_page_bit(page, PG_private_2);

	put_page(page);

	struct folio *folio = page_folio(page);



	VM_BUG_ON_FOLIO(!folio_test_private_2(folio), folio);

	clear_bit_unlock(PG_private_2, folio_flags(folio, 0));

	folio_wake_bit(folio, PG_private_2);

	folio_put(folio);

}

EXPORT_SYMBOL(end_page_private_2);