From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f68.google.com ([74.125.83.68]:42585 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750801AbeAQG0a (ORCPT ); Wed, 17 Jan 2018 01:26:30 -0500 Received: by mail-pg0-f68.google.com with SMTP id q67so10758583pga.9 for ; Tue, 16 Jan 2018 22:26:30 -0800 (PST) From: Eric Biggers To: linux-fsdevel@vger.kernel.org, Alexander Viro Cc: Eric Biggers Subject: [PATCH] fs/buffer.c: fold init_buffer() into init_page_buffers() Date: Tue, 16 Jan 2018 22:25:12 -0800 Message-Id: <20180117062512.19271-1-ebiggers3@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Eric Biggers Since commit e76004093db1 ("fs/buffer.c: remove unnecessary init operation after allocating buffer_head"), there are no callers of init_buffer() outside of init_page_buffers(). So just fold it into init_page_buffers(). Signed-off-by: Eric Biggers --- fs/buffer.c | 10 ++-------- include/linux/buffer_head.h | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index 551b781a7d7b..3b2b415f1fcd 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -53,13 +53,6 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh, #define BH_ENTRY(list) list_entry((list), struct buffer_head, b_assoc_buffers) -void init_buffer(struct buffer_head *bh, bh_end_io_t *handler, void *private) -{ - bh->b_end_io = handler; - bh->b_private = private; -} -EXPORT_SYMBOL(init_buffer); - inline void touch_buffer(struct buffer_head *bh) { trace_block_touch_buffer(bh); @@ -922,7 +915,8 @@ init_page_buffers(struct page *page, struct block_device *bdev, do { if (!buffer_mapped(bh)) { - init_buffer(bh, NULL, NULL); + bh->b_end_io = NULL; + bh->b_private = NULL; bh->b_bdev = bdev; bh->b_blocknr = block; if (uptodate) diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index f1aed01479f8..dead50b38776 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -152,7 +152,6 @@ void buffer_check_dirty_writeback(struct page *page, void mark_buffer_dirty(struct buffer_head *bh); void mark_buffer_write_io_error(struct buffer_head *bh); -void init_buffer(struct buffer_head *, bh_end_io_t *, void *); void touch_buffer(struct buffer_head *bh); void set_bh_page(struct buffer_head *bh, struct page *page, unsigned long offset); -- 2.15.1