Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-block.git] / include / linux / buffer_head.h

diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 33fa5e94aa8071247ced1f32a61a9803e6b409ee..8f14dca5fed7568b5c92f680b455d99a29087513 100644 (file)
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -61,7 +61,10 @@ 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 */
-       struct page *b_page;            /* the page this bh is mapped to */
+       union {
+               struct page *b_page;    /* the page 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 */