summaryrefslogtreecommitdiffstats
path: root/fs/jbd2
diff options
context:
space:
mode:
authorMatthew Wilcox (Oracle) <willy@infradead.org>2022-05-01 07:08:08 +0200
committerMatthew Wilcox (Oracle) <willy@infradead.org>2022-05-10 05:12:34 +0200
commit68189fef88c7d02eb92e038be3d6428ebd0d2945 (patch)
tree27aa837e7dde746eca2904f548a3a17644a48337 /fs/jbd2
parentjbd2: Convert release_buffer_page() to use a folio (diff)
downloadlinux-68189fef88c7d02eb92e038be3d6428ebd0d2945.tar.xz
linux-68189fef88c7d02eb92e038be3d6428ebd0d2945.zip
fs: Change try_to_free_buffers() to take a folio
All but two of the callers already have a folio; pass a folio into try_to_free_buffers(). This removes the last user of cancel_dirty_page() so remove that wrapper function too. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Jeff Layton <jlayton@kernel.org>
Diffstat (limited to 'fs/jbd2')
-rw-r--r--fs/jbd2/commit.c2
-rw-r--r--fs/jbd2/transaction.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 2f37108da0ec..eb315e81f1a6 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -82,7 +82,7 @@ static void release_buffer_page(struct buffer_head *bh)
folio_get(folio);
__brelse(bh);
- try_to_free_buffers(&folio->page);
+ try_to_free_buffers(folio);
folio_unlock(folio);
folio_put(folio);
return;
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index ee33d277d51e..e49bb0938376 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -2175,7 +2175,7 @@ bool jbd2_journal_try_to_free_buffers(journal_t *journal, struct folio *folio)
goto busy;
} while ((bh = bh->b_this_page) != head);
- ret = try_to_free_buffers(&folio->page);
+ ret = try_to_free_buffers(folio);
busy:
return ret;
}
@@ -2482,7 +2482,7 @@ int jbd2_journal_invalidate_folio(journal_t *journal, struct folio *folio,
} while (bh != head);
if (!partial_page) {
- if (may_free && try_to_free_buffers(&folio->page))
+ if (may_free && try_to_free_buffers(folio))
J_ASSERT(!folio_buffers(folio));
}
return 0;