Skip to content

Commit 7312225

Browse files
author
Matthew Wilcox (Oracle)
committed
jbd2: Convert release_buffer_page() to use a folio
Saves a few calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Acked-by: Theodore Ts'o <tytso@mit.edu> Reviewed-by: Jeff Layton <jlayton@kernel.org>
1 parent c56a6eb commit 7312225

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

fs/jbd2/commit.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ static void journal_end_buffer_io_sync(struct buffer_head *bh, int uptodate)
6262
*/
6363
static void release_buffer_page(struct buffer_head *bh)
6464
{
65+
struct folio *folio;
6566
struct page *page;
6667

6768
if (buffer_dirty(bh))
@@ -71,18 +72,19 @@ static void release_buffer_page(struct buffer_head *bh)
7172
page = bh->b_page;
7273
if (!page)
7374
goto nope;
74-
if (page->mapping)
75+
folio = page_folio(page);
76+
if (folio->mapping)
7577
goto nope;
7678

7779
/* OK, it's a truncated page */
78-
if (!trylock_page(page))
80+
if (!folio_trylock(folio))
7981
goto nope;
8082

81-
get_page(page);
83+
folio_get(folio);
8284
__brelse(bh);
83-
try_to_free_buffers(page);
84-
unlock_page(page);
85-
put_page(page);
85+
try_to_free_buffers(&folio->page);
86+
folio_unlock(folio);
87+
folio_put(folio);
8688
return;
8789

8890
nope:

0 commit comments

Comments
 (0)