diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-05-01 06:46:03 +0200 |
|---|---|---|
| committer | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-05-10 05:12:33 +0200 |
| commit | c56a6eb03deb187c989a966fda5a254249b56c2a (patch) | |
| tree | bb27d2572966b028f2efa7df5bf67f449869ab12 /fs | |
| parent | reiserfs: Convert release_buffer_page() to use a folio (diff) | |
| download | linux-c56a6eb03deb187c989a966fda5a254249b56c2a.tar.xz linux-c56a6eb03deb187c989a966fda5a254249b56c2a.zip | |
jbd2: Convert jbd2_journal_try_to_free_buffers to take a folio
Also convert it to return a bool since it's called from release_folio().
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/inode.c | 2 | ||||
| -rw-r--r-- | fs/jbd2/transaction.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 52c46ac5bc8a..943937cb5302 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3253,7 +3253,7 @@ static bool ext4_release_folio(struct folio *folio, gfp_t wait) if (folio_test_checked(folio)) return false; if (journal) - return jbd2_journal_try_to_free_buffers(journal, &folio->page); + return jbd2_journal_try_to_free_buffers(journal, folio); else return try_to_free_buffers(&folio->page); } diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index fcb9175016a5..ee33d277d51e 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -2143,17 +2143,17 @@ out: * cannot happen because we never reallocate freed data as metadata * while the data is part of a transaction. Yes? * - * Return 0 on failure, 1 on success + * Return false on failure, true on success */ -int jbd2_journal_try_to_free_buffers(journal_t *journal, struct page *page) +bool jbd2_journal_try_to_free_buffers(journal_t *journal, struct folio *folio) { struct buffer_head *head; struct buffer_head *bh; - int ret = 0; + bool ret = false; - J_ASSERT(PageLocked(page)); + J_ASSERT(folio_test_locked(folio)); - head = page_buffers(page); + head = folio_buffers(folio); bh = head; do { struct journal_head *jh; @@ -2175,7 +2175,7 @@ int jbd2_journal_try_to_free_buffers(journal_t *journal, struct page *page) goto busy; } while ((bh = bh->b_this_page) != head); - ret = try_to_free_buffers(page); + ret = try_to_free_buffers(&folio->page); busy: return ret; } |