2023-04-17 12:39:21

by Pankaj Raghav

Subject: [PATCH 1/4] fs/buffer: add folio_set_bh helper

The folio version of set_bh_page(). This is required to convert
create_page_buffers() to folio_create_buffers() later in the series.

Signed-off-by: Pankaj Raghav <[email protected]>
---
fs/buffer.c | 15 +++++++++++++++
include/linux/buffer_head.h | 2 ++
2 files changed, 17 insertions(+)

diff --git a/fs/buffer.c b/fs/buffer.c
index b3eb905f87d6..7e74bd77a81b 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -1484,6 +1484,21 @@ void set_bh_page(struct buffer_head *bh,
}
EXPORT_SYMBOL(set_bh_page);

+void folio_set_bh(struct buffer_head *bh, struct folio *folio,
+ unsigned long offset)
+{
+ bh->b_folio = folio;
+ BUG_ON(offset >= folio_size(folio));
+ if (folio_test_highmem(folio))
+ /*
+ * This catches illegal uses and preserves the offset:
+ */
+ bh->b_data = (char *)(0 + offset);
+ else
+ bh->b_data = folio_address(folio) + offset;
+}
+EXPORT_SYMBOL(folio_set_bh);
+
/*
* Called when truncating a buffer on a page completely.
*/
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 8f14dca5fed7..7e92d23f4782 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -196,6 +196,8 @@ void mark_buffer_write_io_error(struct buffer_head *bh);
void touch_buffer(struct buffer_head *bh);
void set_bh_page(struct buffer_head *bh,
struct page *page, unsigned long offset);
+void folio_set_bh(struct buffer_head *bh, struct folio *folio,
+ unsigned long offset);
bool try_to_free_buffers(struct folio *);
struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size,
bool retry);
--
2.34.1

2023-04-17 13:33:14

by Matthew Wilcox

Subject: Re: [PATCH 1/4] fs/buffer: add folio_set_bh helper

On Mon, Apr 17, 2023 at 02:36:15PM +0200, Pankaj Raghav wrote:
> The folio version of set_bh_page(). This is required to convert
> create_page_buffers() to folio_create_buffers() later in the series.
>
> Signed-off-by: Pankaj Raghav <[email protected]>

Yep, not worth making this a wrapper for set_bh_page().

Reviewed-by: Matthew Wilcox (Oracle) <[email protected]>

2023-04-17 14:05:25

by Hannes Reinecke

Subject: Re: [PATCH 1/4] fs/buffer: add folio_set_bh helper

On 4/17/23 14:36, Pankaj Raghav wrote:
> The folio version of set_bh_page(). This is required to convert
> create_page_buffers() to folio_create_buffers() later in the series.
>
> Signed-off-by: Pankaj Raghav <[email protected]>
> ---
> fs/buffer.c | 15 +++++++++++++++
> include/linux/buffer_head.h | 2 ++
> 2 files changed, 17 insertions(+)
>
Reviewed-by: Hannes Reinecke <[email protected]>

Cheers,

Hannes