aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/buffer.c20
-rw-r--r--include/linux/buffer_head.h1
2 files changed, 0 insertions, 21 deletions
diff --git a/fs/buffer.c b/fs/buffer.c
index 1f1577490417..a89d25bf1171 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2189,25 +2189,6 @@ out:
2189 return err; 2189 return err;
2190} 2190}
2191 2191
2192int generic_cont_expand(struct inode *inode, loff_t size)
2193{
2194 unsigned int offset;
2195
2196 offset = (size & (PAGE_CACHE_SIZE - 1)); /* Within page */
2197
2198 /* ugh. in prepare/commit_write, if from==to==start of block, we
2199 * skip the prepare. make sure we never send an offset for the start
2200 * of a block.
2201 * XXX: actually, this should be handled in those filesystems by
2202 * checking for the AOP_FLAG_CONT_EXPAND flag.
2203 */
2204 if ((offset & (inode->i_sb->s_blocksize - 1)) == 0) {
2205 /* caller must handle this extra byte. */
2206 size++;
2207 }
2208 return generic_cont_expand_simple(inode, size);
2209}
2210
2211int cont_expand_zero(struct file *file, struct address_space *mapping, 2192int cont_expand_zero(struct file *file, struct address_space *mapping,
2212 loff_t pos, loff_t *bytes) 2193 loff_t pos, loff_t *bytes)
2213{ 2194{
@@ -3192,7 +3173,6 @@ EXPORT_SYMBOL(file_fsync);
3192EXPORT_SYMBOL(fsync_bdev); 3173EXPORT_SYMBOL(fsync_bdev);
3193EXPORT_SYMBOL(generic_block_bmap); 3174EXPORT_SYMBOL(generic_block_bmap);
3194EXPORT_SYMBOL(generic_commit_write); 3175EXPORT_SYMBOL(generic_commit_write);
3195EXPORT_SYMBOL(generic_cont_expand);
3196EXPORT_SYMBOL(generic_cont_expand_simple); 3176EXPORT_SYMBOL(generic_cont_expand_simple);
3197EXPORT_SYMBOL(init_buffer); 3177EXPORT_SYMBOL(init_buffer);
3198EXPORT_SYMBOL(invalidate_bdev); 3178EXPORT_SYMBOL(invalidate_bdev);
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 1caa71d4c95f..f4ef547fc609 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -217,7 +217,6 @@ int block_prepare_write(struct page*, unsigned, unsigned, get_block_t*);
217int cont_write_begin(struct file *, struct address_space *, loff_t, 217int cont_write_begin(struct file *, struct address_space *, loff_t,
218 unsigned, unsigned, struct page **, void **, 218 unsigned, unsigned, struct page **, void **,
219 get_block_t *, loff_t *); 219 get_block_t *, loff_t *);
220int generic_cont_expand(struct inode *inode, loff_t size);
221int generic_cont_expand_simple(struct inode *inode, loff_t size); 220int generic_cont_expand_simple(struct inode *inode, loff_t size);
222int block_commit_write(struct page *page, unsigned from, unsigned to); 221int block_commit_write(struct page *page, unsigned from, unsigned to);
223int block_page_mkwrite(struct vm_area_struct *vma, struct page *page, 222int block_page_mkwrite(struct vm_area_struct *vma, struct page *page,