It has one caller left, so inline it into bh_end_write(). Signed-off-by: Matthew Wilcox (Oracle) --- fs/buffer.c | 25 ++++++++++--------------- include/linux/buffer_head.h | 1 - 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index 623a09ade8c7..d60b4e2ae68f 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -187,20 +187,6 @@ void bh_end_read(struct bio *bio) } EXPORT_SYMBOL(bh_end_read); -void end_buffer_write_sync(struct buffer_head *bh, int uptodate) -{ - if (uptodate) { - set_buffer_uptodate(bh); - } else { - buffer_io_error(bh, ", lost sync page write"); - mark_buffer_write_io_error(bh); - clear_buffer_uptodate(bh); - } - unlock_buffer(bh); - put_bh(bh); -} -EXPORT_SYMBOL(end_buffer_write_sync); - /** * bh_end_write - I/O end handler for writes * @bio: The bio being completed. @@ -212,7 +198,16 @@ void bh_end_write(struct bio *bio) { bool success = bio->bi_status == BLK_STS_OK; struct buffer_head *bh = bio_endio_bh(bio); - end_buffer_write_sync(bh, success); + + if (success) { + set_buffer_uptodate(bh); + } else { + buffer_io_error(bh, ", lost sync page write"); + mark_buffer_write_io_error(bh); + clear_buffer_uptodate(bh); + } + unlock_buffer(bh); + put_bh(bh); } EXPORT_SYMBOL(bh_end_write); diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 634b0035d40a..37038d44a9e3 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -201,7 +201,6 @@ struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size); 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); struct buffer_head *bio_endio_bh(struct bio *bio); /* Completion routines suitable for passing to bh_submit() */ -- 2.47.3