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>

diff --git a/fs/buffer.c b/fs/buffer.c
index 1f157749041773e9e0e467a72439e190f1952cc5..a89d25bf11714702c2727f5c009216d2078aa416 100644 (file)
--- 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 1caa71d4c95fa513ecb49b46f41a2f25806401aa..f4ef547fc609d3ab5260b9c09ae596d0b7610114 100644 (file)
--- 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,