Commit b3992d1e authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

fs: Remove aop flags parameter from block_write_begin() 



There are no more aop flags left, so remove the parameter.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent de2a9311

block/fops.c

+1 −2
Original line number Diff line number Diff line
@@ -401,8 +401,7 @@ static int blkdev_write_begin(struct file *file, struct address_space *mapping, 
		loff_t pos, unsigned len, unsigned flags, struct page **pagep,

		void **fsdata)

{

	return block_write_begin(mapping, pos, len, flags, pagep,

				 blkdev_get_block);

	return block_write_begin(mapping, pos, len, pagep, blkdev_get_block);

}



static int blkdev_write_end(struct file *file, struct address_space *mapping,

fs/bfs/file.c

+1 −2
Original line number Diff line number Diff line
@@ -174,8 +174,7 @@ static int bfs_write_begin(struct file *file, struct address_space *mapping, 
{

	int ret;



	ret = block_write_begin(mapping, pos, len, flags, pagep,

				bfs_get_block);

	ret = block_write_begin(mapping, pos, len, pagep, bfs_get_block);

	if (unlikely(ret))

		bfs_write_failed(mapping, pos + len);

fs/buffer.c

+3 −3
Original line number Diff line number Diff line
@@ -2104,13 +2104,13 @@ static int __block_commit_write(struct inode *inode, struct page *page, 
 * The filesystem needs to handle block truncation upon failure.

 */

int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len,

		unsigned flags, struct page **pagep, get_block_t *get_block)

		struct page **pagep, get_block_t *get_block)

{

	pgoff_t index = pos >> PAGE_SHIFT;

	struct page *page;

	int status;



	page = grab_cache_page_write_begin(mapping, index, flags);

	page = grab_cache_page_write_begin(mapping, index, 0);

	if (!page)

		return -ENOMEM;
@@ -2460,7 +2460,7 @@ int cont_write_begin(struct file *file, struct address_space *mapping, 
		(*bytes)++;

	}



	return block_write_begin(mapping, pos, len, flags, pagep, get_block);

	return block_write_begin(mapping, pos, len, pagep, get_block);

}

EXPORT_SYMBOL(cont_write_begin);

fs/ext2/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -892,8 +892,7 @@ ext2_write_begin(struct file *file, struct address_space *mapping, 
{

	int ret;



	ret = block_write_begin(mapping, pos, len, flags, pagep,

				ext2_get_block);

	ret = block_write_begin(mapping, pos, len, pagep, ext2_get_block);

	if (ret < 0)

		ext2_write_failed(mapping, pos + len);

	return ret;

fs/minix/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -428,8 +428,7 @@ static int minix_write_begin(struct file *file, struct address_space *mapping, 
{

	int ret;



	ret = block_write_begin(mapping, pos, len, flags, pagep,

				minix_get_block);

	ret = block_write_begin(mapping, pos, len, pagep, minix_get_block);

	if (unlikely(ret))

		minix_write_failed(mapping, pos + len);