iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Since commit e76004093d ("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@google.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Eric Biggers 2018-01-16 22:25:12 -08:00 committed by Al Viro
parent 4bfd054ae1
commit 01950a349e
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/buffer.c
View File

@ -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) #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) inline void touch_buffer(struct buffer_head *bh)
{ {
trace_block_touch_buffer(bh); trace_block_touch_buffer(bh);
@ -922,7 +915,8 @@ init_page_buffers(struct page *page, struct block_device *bdev,
do { do {
if (!buffer_mapped(bh)) { if (!buffer_mapped(bh)) {
init_buffer(bh, NULL, NULL); bh->b_end_io = NULL;
bh->b_private = NULL;
bh->b_bdev = bdev; bh->b_bdev = bdev;
bh->b_blocknr = block; bh->b_blocknr = block;
if (uptodate) if (uptodate)

1
include/linux/buffer_head.h
View File

@ -151,7 +151,6 @@ void buffer_check_dirty_writeback(struct page *page,
void mark_buffer_dirty(struct buffer_head *bh); void mark_buffer_dirty(struct buffer_head *bh);
void mark_buffer_write_io_error(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 touch_buffer(struct buffer_head *bh);
void set_bh_page(struct buffer_head *bh, void set_bh_page(struct buffer_head *bh,
struct page *page, unsigned long offset); struct page *page, unsigned long offset);