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: Matthew 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: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/buffer.c b/fs/buffer.c
index bfa7604d1891272c44488d8ab33b164ec36cda80..657a62bab73d753016d235b08f8b6b5e8397ff11 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -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);

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 8e431ff2fd953eba171747bc16b7378d1531b69e..347fc8986e93b6aeb5f61b9b20d1fba6baae0780 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -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 @@ retry_grab:
         * 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;

diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index 7fe448fb948b47809833bcf1650d4a89da64c756..3aa57376d9c2ecbba3d272b572bf56b924b33103 100644 (file)
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -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 @@ data_copy:
         * 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;

diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
index c26d48355cc2702759ffe8f52f68655f047d8d29..6b060fc9e26091fa3633e58d9381fda8ed07820e 100644 (file)
--- a/fs/gfs2/aops.c
+++ b/fs/gfs2/aops.c
@@ -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));
                }

diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 247d2c16593c00cd492c82a7133f47bdcd688514..f1eee3f4704b61cf7c54d1eaba933325e8173c70 100644 (file)
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -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))

diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index f6d40d51f5ed0008acb2f8595f700d0c7a25008c..25ceb0805df254329b438f6af558e7be8b2f4eeb 100644 (file)
--- a/fs/gfs2/meta_io.c
+++ b/fs/gfs2/meta_io.c
@@ -134,7 +134,7 @@ struct buffer_head *gfs2_getbuf(struct gfs2_glock *gl, u64 blkno, int create)
                                mapping_gfp_mask(mapping) | __GFP_NOFAIL);
                bh = folio_buffers(folio);
                if (!bh)
-                       bh = folio_create_empty_buffers(folio,
+                       bh = create_empty_buffers(folio,
                                sdp->sd_sb.sb_bsize, 0);
        } else {
                folio = __filemap_get_folio(mapping, index,

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 25354278cecbc09f30436df7eabeee69d9765c54..2f1328af34f4d2e935b9dc3f7ec4414c4046a46b 100644 (file)
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -763,7 +763,7 @@ static int gfs2_write_buf_to_page(struct gfs2_sbd *sdp, unsigned long index,
                return PTR_ERR(folio);
        bh = folio_buffers(folio);
        if (!bh)
-               bh = folio_create_empty_buffers(folio, bsize, 0);
+               bh = create_empty_buffers(folio, bsize, 0);
 
        for (;;) {
                /* Find the beginning block within the folio */

diff --git a/fs/mpage.c b/fs/mpage.c
index 964a6efe594d38e5c41ef97bd37959451c3d7265..ffb064ed9d0497110b9ed1b2d98008a63d1799a6 100644 (file)
--- a/fs/mpage.c
+++ b/fs/mpage.c
@@ -119,7 +119,7 @@ static void map_buffer_to_folio(struct folio *folio, struct buffer_head *bh,
                        folio_mark_uptodate(folio);
                        return;
                }
-               head = folio_create_empty_buffers(folio, i_blocksize(inode), 0);
+               head = create_empty_buffers(folio, i_blocksize(inode), 0);
        }
 
        page_bh = head;

diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c
index 7b754e6494d7558f0a1637c0797c194a0c3e53b0..c97c77a3966817c060e173aa1b9f9fa2b16de37d 100644 (file)
--- a/fs/nilfs2/mdt.c
+++ b/fs/nilfs2/mdt.c
@@ -568,7 +568,7 @@ int nilfs_mdt_freeze_buffer(struct inode *inode, struct buffer_head *bh)
 
        bh_frozen = folio_buffers(folio);
        if (!bh_frozen)
-               bh_frozen = folio_create_empty_buffers(folio, 1 << blkbits, 0);
+               bh_frozen = create_empty_buffers(folio, 1 << blkbits, 0);
 
        bh_frozen = get_nth_bh(bh_frozen, bh_offset(bh) >> blkbits);
 

diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c
index 696215d899bfb1536ef45856e85cdd86a586faea..06b04758f289b81394e8ebe9f410658236b6593b 100644 (file)
--- a/fs/nilfs2/page.c
+++ b/fs/nilfs2/page.c
@@ -34,7 +34,7 @@ static struct buffer_head *__nilfs_get_folio_block(struct folio *folio,
        struct buffer_head *bh = folio_buffers(folio);
 
        if (!bh)
-               bh = folio_create_empty_buffers(folio, 1 << blkbits, b_state);
+               bh = create_empty_buffers(folio, 1 << blkbits, b_state);
 
        first_block = (unsigned long)index << (PAGE_SHIFT - blkbits);
        bh = get_nth_bh(bh, block - first_block);
@@ -204,7 +204,7 @@ static void nilfs_copy_folio(struct folio *dst, struct folio *src,
        sbh = folio_buffers(src);
        dbh = folio_buffers(dst);
        if (!dbh)
-               dbh = folio_create_empty_buffers(dst, sbh->b_size, 0);
+               dbh = create_empty_buffers(dst, sbh->b_size, 0);
 
        if (copy_dirty)
                mask |= BIT(BH_Dirty);

diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index 94388fe83cf86462d134446aeb44a3772bb79e6d..55e31cc903d1303b82274af69e5b0a3f686d7707 100644 (file)
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -732,7 +732,7 @@ static size_t nilfs_lookup_dirty_data_buffers(struct inode *inode,
                }
                head = folio_buffers(folio);
                if (!head)
-                       head = folio_create_empty_buffers(folio,
+                       head = create_empty_buffers(folio,
                                        i_blocksize(inode), 0);
                folio_unlock(folio);
 

diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
index c4426992a2ee168be64d742ef956fe173255d676..71e31e789b292e0f3fa645219134423ebd647dbf 100644 (file)
--- a/fs/ntfs/aops.c
+++ b/fs/ntfs/aops.c
@@ -189,7 +189,7 @@ static int ntfs_read_block(struct folio *folio)
 
        head = folio_buffers(folio);
        if (!head)
-               head = folio_create_empty_buffers(folio, blocksize, 0);
+               head = create_empty_buffers(folio, blocksize, 0);
        bh = head;
 
        /*
@@ -555,7 +555,7 @@ static int ntfs_write_block(struct folio *folio, struct writeback_control *wbc)
        head = folio_buffers(folio);
        if (!head) {
                BUG_ON(!folio_test_uptodate(folio));
-               head = folio_create_empty_buffers(folio, blocksize,
+               head = create_empty_buffers(folio, blocksize,
                                (1 << BH_Uptodate) | (1 << BH_Dirty));
        }
        bh = head;

diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 099141d20db64ff22e374f07db17af4ff8459ff1..297c0b9db6211ac5be8f3a297943b29a7586dd5c 100644 (file)
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -625,7 +625,7 @@ do_next_folio:
                 * create_empty_buffers() will create uptodate/dirty
                 * buffers if the folio is uptodate/dirty.
                 */
-               head = folio_create_empty_buffers(folio, blocksize, 0);
+               head = create_empty_buffers(folio, blocksize, 0);
        bh = head;
        do {
                VCN cdelta;

diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
index a003a69091a2cbb2d6587a1761abc9333181aba3..66fd4ac28395f5e311a8a07fb829405294169929 100644 (file)
--- a/fs/ntfs3/file.c
+++ b/fs/ntfs3/file.c
@@ -203,7 +203,7 @@ static int ntfs_zero_range(struct inode *inode, u64 vbo, u64 vbo_to)
 
                head = folio_buffers(folio);
                if (!head)
-                       head = folio_create_empty_buffers(folio, blocksize, 0);
+                       head = create_empty_buffers(folio, blocksize, 0);
 
                bh = head;
                bh_off = 0;

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 95d1e70b4401267a85ac6533bd03f36c0e340788..a6405dd5df09d80c909ae736072697de53252633 100644 (file)
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -601,7 +601,7 @@ int ocfs2_map_page_blocks(struct page *page, u64 *p_blkno,
 
        head = folio_buffers(folio);
        if (!head)
-               head = folio_create_empty_buffers(folio, bsize, 0);
+               head = create_empty_buffers(folio, bsize, 0);
 
        for (bh = head, block_start = 0; bh != head || !block_start;
             bh = bh->b_this_page, block_start += bsize) {

diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index d9737235b8e0a9abb42eef4cb1a452ce83ac6b04..a9075c4843ed9982764b5d49e39378bc552cfe8a 100644 (file)
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -2539,7 +2539,7 @@ static int reiserfs_write_full_folio(struct folio *folio,
         */
        head = folio_buffers(folio);
        if (!head)
-               head = folio_create_empty_buffers(folio, s->s_blocksize,
+               head = create_empty_buffers(folio, s->s_blocksize,
                                     (1 << BH_Dirty) | (1 << BH_Uptodate));
 
        /*

diff --git a/fs/ufs/util.c b/fs/ufs/util.c
index d32de30009a0e582943a727e7dfdf61e8b3688ff..13ba34e6d64ff30f51de4367f3aa08f12796786e 100644 (file)
--- a/fs/ufs/util.c
+++ b/fs/ufs/util.c
@@ -264,6 +264,6 @@ struct folio *ufs_get_locked_folio(struct address_space *mapping,
                }
        }
        if (!folio_buffers(folio))
-               folio_create_empty_buffers(folio, 1 << inode->i_blkbits, 0);
+               create_empty_buffers(folio, 1 << inode->i_blkbits, 0);
        return folio;
 }

diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 3d85a0cf0ca5ea9bf2ee9ffa97cf075f04a566e7..5f23ee599889fe3a87e519e440283ca07e1f97b8 100644 (file)
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -201,9 +201,7 @@ struct buffer_head *folio_alloc_buffers(struct folio *folio, unsigned long size,
                                        gfp_t gfp);
 struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size,
                bool retry);
-void create_empty_buffers(struct page *, unsigned long,
-                       unsigned long b_state);
-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);
 void end_buffer_read_sync(struct buffer_head *bh, int uptodate);
 void end_buffer_write_sync(struct buffer_head *bh, int uptodate);