diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-05-01 06:39:50 -0400 |
|---|---|---|
| committer | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-05-09 23:12:34 -0400 |
| commit | 6439476311a649594124c4cf42f8389661f04e4f (patch) | |
| tree | 2dc7f0a5fc63c8848419b94c2ea3926a16856c94 | |
| parent | 68189fef88c7d02eb92e038be3d6428ebd0d2945 (diff) | |
| download | linux-6439476311a649594124c4cf42f8389661f04e4f.tar.gz | |
fs: Convert drop_buffers() to use a folio
All callers now have a folio. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Jeff Layton <jlayton@kernel.org>
| -rw-r--r-- | fs/buffer.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 701af0035802..898c7f301b1b 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -3180,10 +3180,10 @@ static inline int buffer_busy(struct buffer_head *bh) (bh->b_state & ((1 << BH_Dirty) | (1 << BH_Lock))); } -static int -drop_buffers(struct page *page, struct buffer_head **buffers_to_free) +static bool +drop_buffers(struct folio *folio, struct buffer_head **buffers_to_free) { - struct buffer_head *head = page_buffers(page); + struct buffer_head *head = folio_buffers(folio); struct buffer_head *bh; bh = head; @@ -3201,10 +3201,10 @@ drop_buffers(struct page *page, struct buffer_head **buffers_to_free) bh = next; } while (bh != head); *buffers_to_free = head; - detach_page_private(page); - return 1; + folio_detach_private(folio); + return true; failed: - return 0; + return false; } bool try_to_free_buffers(struct folio *folio) @@ -3218,12 +3218,12 @@ bool try_to_free_buffers(struct folio *folio) return false; if (mapping == NULL) { /* can this still happen? */ - ret = drop_buffers(&folio->page, &buffers_to_free); + ret = drop_buffers(folio, &buffers_to_free); goto out; } spin_lock(&mapping->private_lock); - ret = drop_buffers(&folio->page, &buffers_to_free); + ret = drop_buffers(folio, &buffers_to_free); /* * If the filesystem writes its buffers by hand (eg ext3) |