diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-03-17 04:01:30 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-03-17 04:01:30 -0700 |
| commit | d26a3a6ce7e02f9c056ad992bcd9624735022337 (patch) | |
| tree | 9df8aeaceed50bf65d01172c67f67035c9fa59ef /include/linux/buffer_head.h | |
| parent | 007e50eb5dbe7b33a43a1449a0d9c29e8dcf1c67 (diff) | |
| parent | eeac8ede17557680855031c6f305ece2378af326 (diff) | |
Merge tag 'v6.3-rc2' into next
Merge with mainline to get of_property_present() and other newer APIs.
Diffstat (limited to 'include/linux/buffer_head.h')
| -rw-r--r-- | include/linux/buffer_head.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 33fa5e94aa80..8f14dca5fed7 100644 --- 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 */ |