Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fs/buffer.c: remove block_write_full_page_endio()

The last in-tree caller of block_write_full_page_endio() was removed in
January 2013. It's time to remove the EXPORT_SYMBOL, which leaves
block_write_full_page() as the only caller of
block_write_full_page_endio(), so inline block_write_full_page_endio()
into block_write_full_page().

Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Dheeraj Reddy <dheeraj.reddy@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Matthew Wilcox and committed by
Linus Torvalds
1b938c08 399ba0b9

+7 -20
+5 -16
fs/buffer.c
··· 2879 2879 2880 2880 /* 2881 2881 * The generic ->writepage function for buffer-backed address_spaces 2882 - * this form passes in the end_io handler used to finish the IO. 2883 2882 */ 2884 - int block_write_full_page_endio(struct page *page, get_block_t *get_block, 2885 - struct writeback_control *wbc, bh_end_io_t *handler) 2883 + int block_write_full_page(struct page *page, get_block_t *get_block, 2884 + struct writeback_control *wbc) 2886 2885 { 2887 2886 struct inode * const inode = page->mapping->host; 2888 2887 loff_t i_size = i_size_read(inode); ··· 2891 2892 /* Is the page fully inside i_size? */ 2892 2893 if (page->index < end_index) 2893 2894 return __block_write_full_page(inode, page, get_block, wbc, 2894 - handler); 2895 + end_buffer_async_write); 2895 2896 2896 2897 /* Is the page fully outside i_size? (truncate in progress) */ 2897 2898 offset = i_size & (PAGE_CACHE_SIZE-1); ··· 2914 2915 * writes to that region are not written out to the file." 2915 2916 */ 2916 2917 zero_user_segment(page, offset, PAGE_CACHE_SIZE); 2917 - return __block_write_full_page(inode, page, get_block, wbc, handler); 2918 - } 2919 - EXPORT_SYMBOL(block_write_full_page_endio); 2920 - 2921 - /* 2922 - * The generic ->writepage function for buffer-backed address_spaces 2923 - */ 2924 - int block_write_full_page(struct page *page, get_block_t *get_block, 2925 - struct writeback_control *wbc) 2926 - { 2927 - return block_write_full_page_endio(page, get_block, wbc, 2928 - end_buffer_async_write); 2918 + return __block_write_full_page(inode, page, get_block, wbc, 2919 + end_buffer_async_write); 2929 2920 } 2930 2921 EXPORT_SYMBOL(block_write_full_page); 2931 2922
+1 -1
fs/ext4/page-io.c
··· 429 429 block_start = bh_offset(bh); 430 430 if (block_start >= len) { 431 431 /* 432 - * Comments copied from block_write_full_page_endio: 432 + * Comments copied from block_write_full_page: 433 433 * 434 434 * The page straddles i_size. It must be zeroed out on 435 435 * each and every writepage invocation because it may
+1 -1
fs/ocfs2/file.c
··· 828 828 /* 829 829 * fs-writeback will release the dirty pages without page lock 830 830 * whose offset are over inode size, the release happens at 831 - * block_write_full_page_endio(). 831 + * block_write_full_page(). 832 832 */ 833 833 i_size_write(inode, abs_to); 834 834 inode->i_blocks = ocfs2_inode_sector_count(inode);
-2
include/linux/buffer_head.h
··· 207 207 unsigned int length); 208 208 int block_write_full_page(struct page *page, get_block_t *get_block, 209 209 struct writeback_control *wbc); 210 - int block_write_full_page_endio(struct page *page, get_block_t *get_block, 211 - struct writeback_control *wbc, bh_end_io_t *handler); 212 210 int block_read_full_page(struct page*, get_block_t*); 213 211 int block_is_partially_uptodate(struct page *page, unsigned long from, 214 212 unsigned long count);