Commit 50fabd42 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andreas Gruenbacher
Browse files

gfs2: Convert gfs2_aspace_writepage() to use a folio 



Convert the incoming struct page to a folio and use it throughout.
Saves six calls to compound_head().

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent b8440480

fs/gfs2/meta_io.c

+8 −8
Original line number Diff line number Diff line
@@ -32,14 +32,14 @@ 


static int gfs2_aspace_writepage(struct page *page, struct writeback_control *wbc)

{

	struct folio *folio = page_folio(page);

	struct buffer_head *bh, *head;

	int nr_underway = 0;

	blk_opf_t write_flags = REQ_META | REQ_PRIO | wbc_to_write_flags(wbc);



	BUG_ON(!PageLocked(page));

	BUG_ON(!page_has_buffers(page));

	BUG_ON(!folio_test_locked(folio));



	head = page_buffers(page);

	head = folio_buffers(folio);

	bh = head;



	do {
@@ -55,7 +55,7 @@ static int gfs2_aspace_writepage(struct page *page, struct writeback_control *wb 
		if (wbc->sync_mode != WB_SYNC_NONE) {

			lock_buffer(bh);

		} else if (!trylock_buffer(bh)) {

			redirty_page_for_writepage(wbc, page);

			folio_redirty_for_writepage(wbc, folio);

			continue;

		}

		if (test_clear_buffer_dirty(bh)) {
@@ -69,8 +69,8 @@ static int gfs2_aspace_writepage(struct page *page, struct writeback_control *wb 
	 * The page and its buffers are protected by PageWriteback(), so we can

	 * drop the bh refcounts early.

	 */

	BUG_ON(PageWriteback(page));

	set_page_writeback(page);

	BUG_ON(folio_test_writeback(folio));

	folio_start_writeback(folio);



	do {

		struct buffer_head *next = bh->b_this_page;
@@ -80,10 +80,10 @@ static int gfs2_aspace_writepage(struct page *page, struct writeback_control *wb 
		}

		bh = next;

	} while (bh != head);

	unlock_page(page);

	folio_unlock(folio);



	if (nr_underway == 0)

		end_page_writeback(page);

		folio_end_writeback(folio);



	return 0;

}