2023-07-13 04:03:09

by Matthew Wilcox

Subject: [PATCH 7/7] buffer: Remove set_bh_page()

With all users converted to folio_set_bh(), remove this function.

Signed-off-by: Matthew Wilcox (Oracle) <[email protected]>
---
fs/buffer.c | 15 ---------------
include/linux/buffer_head.h | 2 --
2 files changed, 17 deletions(-)

diff --git a/fs/buffer.c b/fs/buffer.c
index 587e4d4af9de..f0563ebae75f 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -1539,21 +1539,6 @@ void invalidate_bh_lrus_cpu(void)
bh_lru_unlock();
}

-void set_bh_page(struct buffer_head *bh,
- struct page *page, unsigned long offset)
-{
- bh->b_page = page;
- BUG_ON(offset >= PAGE_SIZE);
- if (PageHighMem(page))
- /*
- * This catches illegal uses and preserves the offset:
- */
- bh->b_data = (char *)(0 + offset);
- else
- bh->b_data = page_address(page) + offset;
-}
-EXPORT_SYMBOL(set_bh_page);
-
void folio_set_bh(struct buffer_head *bh, struct folio *folio,
unsigned long offset)
{
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index a7377877ff4e..06566aee94ca 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -194,8 +194,6 @@ void buffer_check_dirty_writeback(struct folio *folio,
void mark_buffer_dirty(struct buffer_head *bh);
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 *);
--
2.39.2

2023-07-31 15:21:45

by Jan Kara

Subject: Re: [PATCH 7/7] buffer: Remove set_bh_page()

On Thu 13-07-23 04:55:12, Matthew Wilcox (Oracle) wrote:
> With all users converted to folio_set_bh(), remove this function.
>
> Signed-off-by: Matthew Wilcox (Oracle) <[email protected]>

Sure. Feel free to add:

Reviewed-by: Jan Kara <[email protected]>

Honza

> ---
> fs/buffer.c | 15 ---------------
> include/linux/buffer_head.h | 2 --
> 2 files changed, 17 deletions(-)
>
> diff --git a/fs/buffer.c b/fs/buffer.c
> index 587e4d4af9de..f0563ebae75f 100644
> --- a/fs/buffer.c
> +++ b/fs/buffer.c
> @@ -1539,21 +1539,6 @@ void invalidate_bh_lrus_cpu(void)
> bh_lru_unlock();
> }
>
> -void set_bh_page(struct buffer_head *bh,
> - struct page *page, unsigned long offset)
> -{
> - bh->b_page = page;
> - BUG_ON(offset >= PAGE_SIZE);
> - if (PageHighMem(page))
> - /*
> - * This catches illegal uses and preserves the offset:
> - */
> - bh->b_data = (char *)(0 + offset);
> - else
> - bh->b_data = page_address(page) + offset;
> -}
> -EXPORT_SYMBOL(set_bh_page);
> -
> void folio_set_bh(struct buffer_head *bh, struct folio *folio,
> unsigned long offset)
> {
> diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
> index a7377877ff4e..06566aee94ca 100644
> --- a/include/linux/buffer_head.h
> +++ b/include/linux/buffer_head.h
> @@ -194,8 +194,6 @@ void buffer_check_dirty_writeback(struct folio *folio,
> void mark_buffer_dirty(struct buffer_head *bh);
> 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 *);
> --
> 2.39.2
>
--
Jan Kara <[email protected]>
SUSE Labs, CR