On Tue 16-01-18 22:25:12, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@xxxxxxxxxx>
>
> 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 <ebiggers@xxxxxxxxxx>
Looks good. You can add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> 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
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
