|
@@ -2879,10 +2879,9 @@ EXPORT_SYMBOL(block_truncate_page);
|
|
|
|
|
|
/*
|
|
|
* 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,
|
|
|
- struct writeback_control *wbc, bh_end_io_t *handler)
|
|
|
+int block_write_full_page(struct page *page, get_block_t *get_block,
|
|
|
+ struct writeback_control *wbc)
|
|
|
{
|
|
|
struct inode * const inode = page->mapping->host;
|
|
|
loff_t i_size = i_size_read(inode);
|
|
@@ -2892,7 +2891,7 @@ int block_write_full_page_endio(struct page *page, get_block_t *get_block,
|
|
|
/* 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);
|
|
@@ -2915,18 +2914,8 @@ int block_write_full_page_endio(struct page *page, get_block_t *get_block,
|
|
|
* 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);
|
|
|
-}
|
|
|
-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);
|
|
|
+ return __block_write_full_page(inode, page, get_block, wbc,
|
|
|
+ end_buffer_async_write);
|
|
|
}
|
|
|
EXPORT_SYMBOL(block_write_full_page);
|
|
|
|