diff options
author | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2014-06-04 19:07:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 19:54:02 -0400 |
commit | 1b938c0827478df268d2336469ec48d400a2eb3e (patch) | |
tree | 46d7d57af2408104e40c361d7993f198b492f91e /fs/buffer.c | |
parent | 399ba0b95670c70aaaa3f4f1623ea9e76c391681 (diff) |
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>
Diffstat (limited to 'fs/buffer.c')
-rw-r--r-- | fs/buffer.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 6a8110c03a47..e33f8d5452ad 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
@@ -2879,10 +2879,9 @@ EXPORT_SYMBOL(block_truncate_page); | |||
2879 | 2879 | ||
2880 | /* | 2880 | /* |
2881 | * The generic ->writepage function for buffer-backed address_spaces | 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, | 2883 | int block_write_full_page(struct page *page, get_block_t *get_block, |
2885 | struct writeback_control *wbc, bh_end_io_t *handler) | 2884 | struct writeback_control *wbc) |
2886 | { | 2885 | { |
2887 | struct inode * const inode = page->mapping->host; | 2886 | struct inode * const inode = page->mapping->host; |
2888 | loff_t i_size = i_size_read(inode); | 2887 | 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, | |||
2892 | /* Is the page fully inside i_size? */ | 2891 | /* Is the page fully inside i_size? */ |
2893 | if (page->index < end_index) | 2892 | if (page->index < end_index) |
2894 | return __block_write_full_page(inode, page, get_block, wbc, | 2893 | return __block_write_full_page(inode, page, get_block, wbc, |
2895 | handler); | 2894 | end_buffer_async_write); |
2896 | 2895 | ||
2897 | /* Is the page fully outside i_size? (truncate in progress) */ | 2896 | /* Is the page fully outside i_size? (truncate in progress) */ |
2898 | offset = i_size & (PAGE_CACHE_SIZE-1); | 2897 | 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, | |||
2915 | * writes to that region are not written out to the file." | 2914 | * writes to that region are not written out to the file." |
2916 | */ | 2915 | */ |
2917 | zero_user_segment(page, offset, PAGE_CACHE_SIZE); | 2916 | zero_user_segment(page, offset, PAGE_CACHE_SIZE); |
2918 | return __block_write_full_page(inode, page, get_block, wbc, handler); | 2917 | return __block_write_full_page(inode, page, get_block, wbc, |
2919 | } | 2918 | end_buffer_async_write); |
2920 | EXPORT_SYMBOL(block_write_full_page_endio); | ||
2921 | |||
2922 | /* | ||
2923 | * The generic ->writepage function for buffer-backed address_spaces | ||
2924 | */ | ||
2925 | int block_write_full_page(struct page *page, get_block_t *get_block, | ||
2926 | struct writeback_control *wbc) | ||
2927 | { | ||
2928 | return block_write_full_page_endio(page, get_block, wbc, | ||
2929 | end_buffer_async_write); | ||
2930 | } | 2919 | } |
2931 | EXPORT_SYMBOL(block_write_full_page); | 2920 | EXPORT_SYMBOL(block_write_full_page); |
2932 | 2921 | ||