diff options
| author | Nick Piggin <npiggin@suse.de> | 2007-10-16 01:25:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 09:42:56 -0700 |
| commit | a20fa20c549ed569885d871f689a59cfd2f6ff77 (patch) | |
| tree | bc6f7119cec83032eb43c27d6ec7bbbebd2fdddb | |
| parent | f7557e8f7ff785d6c2b5bc914cd1675314ff0fcf (diff) | |
| download | linux-3.10-a20fa20c549ed569885d871f689a59cfd2f6ff77.tar.gz linux-3.10-a20fa20c549ed569885d871f689a59cfd2f6ff77.tar.bz2 linux-3.10-a20fa20c549ed569885d871f689a59cfd2f6ff77.zip | |
With reiserfs no longer using the weird generic_cont_expand, remove it completely.
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/buffer.c | 20 | ||||
| -rw-r--r-- | include/linux/buffer_head.h | 1 |
2 files changed, 0 insertions, 21 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 1f157749041..a89d25bf117 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -2189,25 +2189,6 @@ out: return err; } -int generic_cont_expand(struct inode *inode, loff_t size) -{ - unsigned int offset; - - offset = (size & (PAGE_CACHE_SIZE - 1)); /* Within page */ - - /* ugh. in prepare/commit_write, if from==to==start of block, we - * skip the prepare. make sure we never send an offset for the start - * of a block. - * XXX: actually, this should be handled in those filesystems by - * checking for the AOP_FLAG_CONT_EXPAND flag. - */ - if ((offset & (inode->i_sb->s_blocksize - 1)) == 0) { - /* caller must handle this extra byte. */ - size++; - } - return generic_cont_expand_simple(inode, size); -} - int cont_expand_zero(struct file *file, struct address_space *mapping, loff_t pos, loff_t *bytes) { @@ -3192,7 +3173,6 @@ EXPORT_SYMBOL(file_fsync); EXPORT_SYMBOL(fsync_bdev); EXPORT_SYMBOL(generic_block_bmap); EXPORT_SYMBOL(generic_commit_write); -EXPORT_SYMBOL(generic_cont_expand); EXPORT_SYMBOL(generic_cont_expand_simple); EXPORT_SYMBOL(init_buffer); EXPORT_SYMBOL(invalidate_bdev); diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 1caa71d4c95..f4ef547fc60 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*); int cont_write_begin(struct file *, struct address_space *, loff_t, unsigned, unsigned, struct page **, void **, get_block_t *, loff_t *); -int generic_cont_expand(struct inode *inode, loff_t size); int generic_cont_expand_simple(struct inode *inode, loff_t size); int block_commit_write(struct page *page, unsigned from, unsigned to); int block_page_mkwrite(struct vm_area_struct *vma, struct page *page, |