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().

Matthew Wilcox committed 12 years ago

Commit 1b938c01 parent 399ba0b4 files · +7 −20Browse files

Unified · Split

4 files

fs/buffer.c +5 −16
fs/ext4/page-io.c +1 −1
fs/ocfs2/file.c +1 −1
include/linux/buffer_head.h +0 −2

fs/buffer.c+5−16

 /*
  * The generic ->writepage function for buffer-backed address_spaces
- * this form passes in the end_io handler used to finish the IO.
  */
-int block_write_full_page_endio(struct page *page, get_block_t *get_block,
+int block_write_full_page(struct page *page, get_block_t *get_block,
-			struct writeback_control *wbc, bh_end_io_t *handler)
+			struct writeback_control *wbc)
 {
 	struct inode * const inode = page->mapping->host;
 	loff_t i_size = i_size_read(inode);
 	/* Is the page fully inside i_size? */
 	if (page->index < end_index)
 		return __block_write_full_page(inode, page, get_block, wbc,
-					       handler);
+					       end_buffer_async_write);
 	/* Is the page fully outside i_size? (truncate in progress) */
 	offset = i_size & (PAGE_CACHE_SIZE-1);
 	 * writes to that region are not written out to the file."
 	 */
 	zero_user_segment(page, offset, PAGE_CACHE_SIZE);
-	return __block_write_full_page(inode, page, get_block, wbc, handler);
+	return __block_write_full_page(inode, page, get_block, wbc,
-}
+							end_buffer_async_write);
-EXPORT_SYMBOL(block_write_full_page_endio);
-/*
- * The generic ->writepage function for buffer-backed address_spaces
- */
-int block_write_full_page(struct page *page, get_block_t *get_block,
-			struct writeback_control *wbc)
-{
-	return block_write_full_page_endio(page, get_block, wbc,
-					   end_buffer_async_write);
 }
 EXPORT_SYMBOL(block_write_full_page);

fs/ext4/page-io.c+1−1

@@ -429,7 +429,7 @@ int ext4_bio_write_page(struct ext4_io_submit *io, · 428 unmodified lines
429	block_start = bh_offset(bh);	429	block_start = bh_offset(bh);
430	if (block_start >= len) {	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	* The page straddles i_size. It must be zeroed out on	434	* The page straddles i_size. It must be zeroed out on
435	* each and every writepage invocation because it may	435	* each and every writepage invocation because it may

fs/ocfs2/file.c+1−1

@@ -828,7 +828,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from, · 827 unmodified lines
828	/*	828	/*
829	* fs-writeback will release the dirty pages without page lock	829	* fs-writeback will release the dirty pages without page lock
830	* whose offset are over inode size, the release happens at	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	i_size_write(inode, abs_to);	833	i_size_write(inode, abs_to);
834	inode->i_blocks = ocfs2_inode_sector_count(inode);	834	inode->i_blocks = ocfs2_inode_sector_count(inode);

include/linux/buffer_head.h+0−2

 			  unsigned int length);
 int block_write_full_page(struct page *page, get_block_t *get_block,
 				struct writeback_control *wbc);
-int block_write_full_page_endio(struct page *page, get_block_t *get_block,
-			struct writeback_control *wbc, bh_end_io_t *handler);
 int block_read_full_page(struct page*, get_block_t*);
 int block_is_partially_uptodate(struct page *page, unsigned long from,
 				unsigned long count);