[PATCH v4 14/16] buffer: replace page_buffer() with page_private() and delete it
From: Zi Yan <ziy@nvidia.com>
Date: 2026-09-14 02:24:54
Also in:
linux-fsdevel, linux-mm, lkml
Subsystem:
software raid (multiple disks) support, the rest · Maintainers:
Song Liu, Yu Kuai, Linus Torvalds
Only two users (in md-bitmap) use page_buffer() and both can be converted to use page_private(). Convert both and remove page_buffer(). Assisted-by: LLM Signed-off-by: Zi Yan <ziy@nvidia.com> To: Song Liu <song@kernel.org> To: Yu Kuai <yukuai@fygo.io> To: Jan Kara <jack@suse.cz> To: "Matthew Wilcox (Oracle)" <willy@infradead.org> Cc: Li Nan <magiclinan@didiglobal.com> Cc: Xiao Ni <xiao@kernel.org> Cc: linux-raid@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/md/md-bitmap.c | 7 +++---- include/linux/buffer_head.h | 6 ------ 2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
index 84122834b6108..7b706d3e54901 100644
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c@@ -516,7 +516,7 @@ static void end_bitmap_write(struct bio *bio) static void write_file_page(struct bitmap *bitmap, struct page *page, int wait) { - struct buffer_head *bh = page_buffers(page); + struct buffer_head *bh = (struct buffer_head *)page_private(page); while (bh && bh->b_blocknr) { atomic_inc(&bitmap->pending_writes);
@@ -533,12 +533,11 @@ static void write_file_page(struct bitmap *bitmap, struct page *page, int wait) static void free_buffers(struct page *page) { - struct buffer_head *bh; + struct buffer_head *bh = (struct buffer_head *)page_private(page); - if (!page_private(page)) + if (!bh) return; - bh = page_buffers(page); while (bh) { struct buffer_head *next = bh->b_this_page; free_buffer_head(bh);
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index fd2c7115c0542..e47fbd0387b69 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h@@ -175,12 +175,6 @@ static inline unsigned long bh_offset(const struct buffer_head *bh) return (unsigned long)(bh)->b_data & (page_size(bh->b_page) - 1); } -/* If we *know* page->private refers to buffer_heads */ -#define page_buffers(page) \ - ({ \ - BUG_ON(!PagePrivate(page)); \ - ((struct buffer_head *)page_private(page)); \ - }) #define folio_buffers(folio) folio_get_private(folio) void buffer_check_dirty_writeback(struct folio *folio,
--
2.53.0