diff options
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 3db4a26adc44..189efa4efc6e 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -2211,8 +2211,8 @@ out: | |||
| 2211 | return err; | 2211 | return err; |
| 2212 | } | 2212 | } |
| 2213 | 2213 | ||
| 2214 | int cont_expand_zero(struct file *file, struct address_space *mapping, | 2214 | static int cont_expand_zero(struct file *file, struct address_space *mapping, |
| 2215 | loff_t pos, loff_t *bytes) | 2215 | loff_t pos, loff_t *bytes) |
| 2216 | { | 2216 | { |
| 2217 | struct inode *inode = mapping->host; | 2217 | struct inode *inode = mapping->host; |
| 2218 | unsigned blocksize = 1 << inode->i_blkbits; | 2218 | unsigned blocksize = 1 << inode->i_blkbits; |
| @@ -2328,23 +2328,6 @@ int block_commit_write(struct page *page, unsigned from, unsigned to) | |||
| 2328 | return 0; | 2328 | return 0; |
| 2329 | } | 2329 | } |
| 2330 | 2330 | ||
| 2331 | int generic_commit_write(struct file *file, struct page *page, | ||
| 2332 | unsigned from, unsigned to) | ||
| 2333 | { | ||
| 2334 | struct inode *inode = page->mapping->host; | ||
| 2335 | loff_t pos = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to; | ||
| 2336 | __block_commit_write(inode,page,from,to); | ||
| 2337 | /* | ||
| 2338 | * No need to use i_size_read() here, the i_size | ||
| 2339 | * cannot change under us because we hold i_mutex. | ||
| 2340 | */ | ||
| 2341 | if (pos > inode->i_size) { | ||
| 2342 | i_size_write(inode, pos); | ||
| 2343 | mark_inode_dirty(inode); | ||
| 2344 | } | ||
| 2345 | return 0; | ||
| 2346 | } | ||
| 2347 | |||
| 2348 | /* | 2331 | /* |
| 2349 | * block_page_mkwrite() is not allowed to change the file size as it gets | 2332 | * block_page_mkwrite() is not allowed to change the file size as it gets |
| 2350 | * called from a page fault handler when a page is first dirtied. Hence we must | 2333 | * called from a page fault handler when a page is first dirtied. Hence we must |
| @@ -3315,7 +3298,6 @@ EXPORT_SYMBOL(end_buffer_write_sync); | |||
| 3315 | EXPORT_SYMBOL(file_fsync); | 3298 | EXPORT_SYMBOL(file_fsync); |
| 3316 | EXPORT_SYMBOL(fsync_bdev); | 3299 | EXPORT_SYMBOL(fsync_bdev); |
| 3317 | EXPORT_SYMBOL(generic_block_bmap); | 3300 | EXPORT_SYMBOL(generic_block_bmap); |
| 3318 | EXPORT_SYMBOL(generic_commit_write); | ||
| 3319 | EXPORT_SYMBOL(generic_cont_expand_simple); | 3301 | EXPORT_SYMBOL(generic_cont_expand_simple); |
| 3320 | EXPORT_SYMBOL(init_buffer); | 3302 | EXPORT_SYMBOL(init_buffer); |
| 3321 | EXPORT_SYMBOL(invalidate_bdev); | 3303 | EXPORT_SYMBOL(invalidate_bdev); |
