Commit 0a88810d authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

buffer: remove folio_create_empty_buffers() 

With all users converted, remove the old create_empty_buffers() and rename
folio_create_empty_buffers() to create_empty_buffers().

Link: https://lkml.kernel.org/r/20231016201114.1928083-28-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Cc: Andreas Gruenbacher <agruenba@redhat.com>
Cc: Pankaj Raghav <p.raghav@samsung.com>
Cc: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent c9f2480e

fs/buffer.c

+3 −10
Original line number Diff line number Diff line
@@ -1641,7 +1641,7 @@ EXPORT_SYMBOL(block_invalidate_folio); 
 * block_dirty_folio() via private_lock.  try_to_free_buffers

 * is already excluded via the folio lock.

 */

struct buffer_head *folio_create_empty_buffers(struct folio *folio,

struct buffer_head *create_empty_buffers(struct folio *folio,

		unsigned long blocksize, unsigned long b_state)

{

	struct buffer_head *bh, *head, *tail;
@@ -1672,13 +1672,6 @@ struct buffer_head *folio_create_empty_buffers(struct folio *folio, 


	return head;

}

EXPORT_SYMBOL(folio_create_empty_buffers);



void create_empty_buffers(struct page *page,

			unsigned long blocksize, unsigned long b_state)

{

	folio_create_empty_buffers(page_folio(page), blocksize, b_state);

}

EXPORT_SYMBOL(create_empty_buffers);



/**
@@ -1778,7 +1771,7 @@ static struct buffer_head *folio_create_buffers(struct folio *folio, 


	bh = folio_buffers(folio);

	if (!bh)

		bh = folio_create_empty_buffers(folio,

		bh = create_empty_buffers(folio,

				1 << READ_ONCE(inode->i_blkbits), b_state);

	return bh;

}
@@ -2681,7 +2674,7 @@ int block_truncate_page(struct address_space *mapping, 


	bh = folio_buffers(folio);

	if (!bh)

		bh = folio_create_empty_buffers(folio, blocksize, 0);

		bh = create_empty_buffers(folio, blocksize, 0);



	/* Find the buffer that contains "offset" */

	offset = offset_in_folio(folio, from);

fs/ext4/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -1021,7 +1021,7 @@ static int ext4_block_write_begin(struct folio *folio, loff_t pos, unsigned len, 


	head = folio_buffers(folio);

	if (!head)

		head = folio_create_empty_buffers(folio, blocksize, 0);

		head = create_empty_buffers(folio, blocksize, 0);

	bbits = ilog2(blocksize);

	block = (sector_t)folio->index << (PAGE_SHIFT - bbits);
@@ -1151,7 +1151,7 @@ static int ext4_write_begin(struct file *file, struct address_space *mapping, 
	 * starting the handle.

	 */

	if (!folio_buffers(folio))

		folio_create_empty_buffers(folio, inode->i_sb->s_blocksize, 0);

		create_empty_buffers(folio, inode->i_sb->s_blocksize, 0);



	folio_unlock(folio);
@@ -3642,7 +3642,7 @@ static int __ext4_block_zero_page_range(handle_t *handle, 


	bh = folio_buffers(folio);

	if (!bh)

		bh = folio_create_empty_buffers(folio, blocksize, 0);

		bh = create_empty_buffers(folio, blocksize, 0);



	/* Find the buffer that contains "offset" */

	pos = blocksize;

fs/ext4/move_extent.c

+2 −2
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ mext_page_mkuptodate(struct folio *folio, unsigned from, unsigned to) 
	blocksize = i_blocksize(inode);

	head = folio_buffers(folio);

	if (!head)

		head = folio_create_empty_buffers(folio, blocksize, 0);

		head = create_empty_buffers(folio, blocksize, 0);



	block = (sector_t)folio->index << (PAGE_SHIFT - inode->i_blkbits);

	for (bh = head, block_start = 0; bh != head || !block_start;
@@ -380,7 +380,7 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, 
	 * but keeping in mind that i_size will not change */

	bh = folio_buffers(folio[0]);

	if (!bh)

		bh = folio_create_empty_buffers(folio[0],

		bh = create_empty_buffers(folio[0],

				1 << orig_inode->i_blkbits, 0);

	for (i = 0; i < data_offset_in_page; i++)

		bh = bh->b_this_page;

fs/gfs2/aops.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static int __gfs2_jdata_write_folio(struct folio *folio, 
	if (folio_test_checked(folio)) {

		folio_clear_checked(folio);

		if (!folio_buffers(folio)) {

			folio_create_empty_buffers(folio,

			create_empty_buffers(folio,

					inode->i_sb->s_blocksize,

					BIT(BH_Dirty)|BIT(BH_Uptodate));

		}

fs/gfs2/bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static int gfs2_unstuffer_folio(struct gfs2_inode *ip, struct buffer_head *dibh, 
		struct buffer_head *bh = folio_buffers(folio);



		if (!bh)

			bh = folio_create_empty_buffers(folio,

			bh = create_empty_buffers(folio,

				BIT(inode->i_blkbits), BIT(BH_Uptodate));



		if (!buffer_mapped(bh))