]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
buffer: Remove mark_buffer_async_write_endio()
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Thu, 28 May 2026 17:31:16 +0000 (18:31 +0100)
committerChristian Brauner <brauner@kernel.org>
Thu, 4 Jun 2026 08:28:06 +0000 (10:28 +0200)
All callers of mark_buffer_async_write_endio() pass
end_buffer_async_write, so we can inline mark_buffer_async_write_endio()
into mark_buffer_async_write() and just call that instead.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Link: https://patch.msgid.link/20260528173150.1093780-4-willy@infradead.org
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>
fs/buffer.c

index ea926963529e800ae372e718a97fd5aa47852d62..4dcce64ef0069e4fb87cc86999a4fd3a35d9f71f 100644 (file)
@@ -443,16 +443,10 @@ static void mark_buffer_async_read(struct buffer_head *bh)
        set_buffer_async_read(bh);
 }
 
-static void mark_buffer_async_write_endio(struct buffer_head *bh,
-                                         bh_end_io_t *handler)
-{
-       bh->b_end_io = handler;
-       set_buffer_async_write(bh);
-}
-
 void mark_buffer_async_write(struct buffer_head *bh)
 {
-       mark_buffer_async_write_endio(bh, end_buffer_async_write);
+       bh->b_end_io = end_buffer_async_write;
+       set_buffer_async_write(bh);
 }
 EXPORT_SYMBOL(mark_buffer_async_write);
 
@@ -1903,8 +1897,7 @@ int __block_write_full_folio(struct inode *inode, struct folio *folio,
                        continue;
                }
                if (test_clear_buffer_dirty(bh)) {
-                       mark_buffer_async_write_endio(bh,
-                               end_buffer_async_write);
+                       mark_buffer_async_write(bh);
                } else {
                        unlock_buffer(bh);
                }
@@ -1958,8 +1951,7 @@ recover:
                if (buffer_mapped(bh) && buffer_dirty(bh) &&
                    !buffer_delay(bh)) {
                        lock_buffer(bh);
-                       mark_buffer_async_write_endio(bh,
-                               end_buffer_async_write);
+                       mark_buffer_async_write(bh);
                } else {
                        /*
                         * The buffer may have been set dirty during