fs: Remove bh->b_page

All users are now using bh->b_folio.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 932139c5d46f5dea558469d3a972da0322b426a0..60e65636ad94b5ae244046a85d9c4e77cba7000a 100644 (file)
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -59,10 +59,7 @@ typedef void (bh_end_io_t)(struct buffer_head *bh, int uptodate);
 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 */
@@ -173,7 +170,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 */