diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-01-17 07:25:12 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-01-26 01:34:28 +0100 |
| commit | 01950a349ec254f28bf9ad06e74a166521d213e1 (patch) | |
| tree | 761fb7da7cc373bfe232e3d98839da31f78013cc | |
| parent | fs: fold __inode_permission() into inode_permission() (diff) | |
| download | linux-01950a349ec254f28bf9ad06e74a166521d213e1.tar.xz linux-01950a349ec254f28bf9ad06e74a166521d213e1.zip | |
fs/buffer.c: fold init_buffer() into init_page_buffers()
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@google.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/buffer.c | 10 | ||||
| -rw-r--r-- | include/linux/buffer_head.h | 1 |
2 files changed, 2 insertions, 9 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 0736a6a2e2f0..3091801169ce 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 8b1bf8d3d4a2..58a82f58e44e 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -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); |