Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01950a34 authored by Eric Biggers's avatar Eric Biggers Committed by Al Viro
Browse files

fs/buffer.c: fold init_buffer() into init_page_buffers() 



Since commit e7600409 ("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: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 4bfd054a

fs/buffer.c

+2 −8
Original line number Diff line number Diff line
@@ -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)

include/linux/buffer_head.h

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,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);