summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMatthew Wilcox (Oracle) <willy@infradead.org>2026-08-06 12:58:24 -0400
committerChristian Brauner <brauner@kernel.org>2026-08-31 10:19:21 +0200
commit719ecb98ffe7ce040abc263e00befbb201d5be97 (patch)
tree94d956fe0931487ea47a5e620d0d9ff47e4d58d0 /include
parentcee9395acd8043be0644b25c34bfa86623f2b935 (diff)
downloadlinux-next-719ecb98ffe7ce040abc263e00befbb201d5be97.tar.gz
linux-next-719ecb98ffe7ce040abc263e00befbb201d5be97.zip
buffer_head: Remove b_page
All users except bh_offset() have been converted to use b_folio instead. Convert bh_offset() and remove b_page. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Signed-off-by: Chao Shi <coshi036@gmail.com> Acked-by: Weidong Zhu <weizhu@fiu.edu> Reviewed-by: Jan Kara <jack@suse.cz> Link: https://patch.msgid.link/e9d168901578902bffe78ac8b5dfaf1210ee7fb3.1785951556.git.coshi036@gmail.com Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/buffer_head.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index fd2c7115c054..699970b4bbf2 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -59,10 +59,7 @@ struct address_space;
struct buffer_head {
unsigned long b_state; /* buffer state bitmap (see above) */
struct buffer_head *b_this_page;/* circular list of page's buffers */
- union {
- struct page *b_page; /* the page this bh is mapped to */
- struct folio *b_folio; /* the folio this bh is mapped to */
- };
+ struct folio *b_folio; /* the folio this bh is mapped to */
sector_t b_blocknr; /* start block number */
size_t b_size; /* size of mapping */
@@ -172,7 +169,7 @@ static __always_inline int buffer_uptodate(const struct buffer_head *bh)
static inline unsigned long bh_offset(const struct buffer_head *bh)
{
- return (unsigned long)(bh)->b_data & (page_size(bh->b_page) - 1);
+ return (unsigned long)(bh)->b_data & (folio_size(bh->b_folio) - 1);
}
/* If we *know* page->private refers to buffer_heads */