fs: remove the bh_end_io argument from __block_write_full_folio

All callers are passing end_buffer_async_write as this argument, so we can
hardcode references to it within __block_write_full_folio().  That lets us
make end_buffer_async_write() static.

Link: https://lkml.kernel.org/r/20231215200245.748418-15-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/buffer.c b/fs/buffer.c
index c838b4a31009210c37672be0fb20c6062d5d86af..19548369bc6cab3216e7a8eb3e328d4007297825 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -372,10 +372,10 @@ static void end_buffer_async_read_io(struct buffer_head *bh, int uptodate)
 }
 
 /*
- * Completion handler for block_write_full_folio() - pages which are unlocked
- * during I/O, and which have PageWriteback cleared upon I/O completion.
+ * Completion handler for block_write_full_folio() - folios which are unlocked
+ * during I/O, and which have the writeback flag cleared upon I/O completion.
  */
-void end_buffer_async_write(struct buffer_head *bh, int uptodate)
+static void end_buffer_async_write(struct buffer_head *bh, int uptodate)
 {
        unsigned long flags;
        struct buffer_head *first;
@@ -415,7 +415,6 @@ still_busy:
        spin_unlock_irqrestore(&first->b_uptodate_lock, flags);
        return;
 }
-EXPORT_SYMBOL(end_buffer_async_write);
 
 /*
  * If a page's buffers are under async readin (end_buffer_async_read
@@ -1787,8 +1786,7 @@ static struct buffer_head *folio_create_buffers(struct folio *folio,
  * causes the writes to be flagged as synchronous writes.
  */
 int __block_write_full_folio(struct inode *inode, struct folio *folio,
-                       get_block_t *get_block, struct writeback_control *wbc,
-                       bh_end_io_t *handler)
+                       get_block_t *get_block, struct writeback_control *wbc)
 {
        int err;
        sector_t block;
@@ -1867,7 +1865,8 @@ int __block_write_full_folio(struct inode *inode, struct folio *folio,
                        continue;
                }
                if (test_clear_buffer_dirty(bh)) {
-                       mark_buffer_async_write_endio(bh, handler);
+                       mark_buffer_async_write_endio(bh,
+                               end_buffer_async_write);
                } else {
                        unlock_buffer(bh);
                }
@@ -1920,7 +1919,8 @@ recover:
                if (buffer_mapped(bh) && buffer_dirty(bh) &&
                    !buffer_delay(bh)) {
                        lock_buffer(bh);
-                       mark_buffer_async_write_endio(bh, handler);
+                       mark_buffer_async_write_endio(bh,
+                               end_buffer_async_write);
                } else {
                        /*
                         * The buffer may have been set dirty during
@@ -2704,8 +2704,7 @@ int block_write_full_folio(struct folio *folio, struct writeback_control *wbc,
 
        /* Is the folio fully inside i_size? */
        if (folio_pos(folio) + folio_size(folio) <= i_size)
-               return __block_write_full_folio(inode, folio, get_block, wbc,
-                                              end_buffer_async_write);
+               return __block_write_full_folio(inode, folio, get_block, wbc);
 
        /* Is the folio fully outside i_size? (truncate in progress) */
        if (folio_pos(folio) >= i_size) {
@@ -2722,8 +2721,7 @@ int block_write_full_folio(struct folio *folio, struct writeback_control *wbc,
         */
        folio_zero_segment(folio, offset_in_folio(folio, i_size),
                        folio_size(folio));
-       return __block_write_full_folio(inode, folio, get_block, wbc,
-                       end_buffer_async_write);
+       return __block_write_full_folio(inode, folio, get_block, wbc);
 }
 
 sector_t generic_block_bmap(struct address_space *mapping, sector_t block,

diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
index f986cd032b7699b7620902eb557e6daa4bf3cd06..9914d7f54f7d3e1d5a0bd74df06cb2fc0c69e955 100644 (file)
--- a/fs/gfs2/aops.c
+++ b/fs/gfs2/aops.c
@@ -108,7 +108,7 @@ static int gfs2_write_jdata_folio(struct folio *folio,
                                folio_size(folio));
 
        return __block_write_full_folio(inode, folio, gfs2_get_block_noalloc,
-                       wbc, end_buffer_async_write);
+                       wbc);
 }
 
 /**

diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 396b2adf24bf1a20533f6217bea946f82603af7b..d78454a4dd1f0fd9f8d46ae4337c4324b4d079eb 100644 (file)
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -205,7 +205,6 @@ 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);
-void end_buffer_async_write(struct buffer_head *bh, int uptodate);
 
 /* Things to do with buffers at mapping->private_list */
 void mark_buffer_dirty_inode(struct buffer_head *bh, struct inode *inode);
@@ -255,8 +254,7 @@ void block_invalidate_folio(struct folio *folio, size_t offset, size_t length);
 int block_write_full_folio(struct folio *folio, struct writeback_control *wbc,
                void *get_block);
 int __block_write_full_folio(struct inode *inode, struct folio *folio,
-                       get_block_t *get_block, struct writeback_control *wbc,
-                       bh_end_io_t *handler);
+               get_block_t *get_block, struct writeback_control *wbc);
 int block_read_full_folio(struct folio *, get_block_t *);
 bool block_is_partially_uptodate(struct folio *, size_t from, size_t count);
 int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len,