Commit a20fa20c authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds
Browse files

With reiserfs no longer using the weird generic_cont_expand, remove it completely. 



Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f7557e8f

fs/buffer.c

+0 −20
Original line number Diff line number Diff line
@@ -2189,25 +2189,6 @@ int generic_cont_expand_simple(struct inode *inode, loff_t size) 
	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);

include/linux/buffer_head.h

+0 −1
Original line number Diff line number Diff line
@@ -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,