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

fs: Remove aop flags parameter from nobh_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 b7446e7c

fs/buffer.c

+1 −2
Original line number Diff line number Diff line
@@ -2568,8 +2568,7 @@ static void attach_nobh_buffers(struct page *page, struct buffer_head *head) 
 * On exit the page is fully uptodate in the areas outside (from,to)

 * The filesystem needs to handle block truncation upon failure.

 */

int nobh_write_begin(struct address_space *mapping,

			loff_t pos, unsigned len, unsigned flags,

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

			struct page **pagep, void **fsdata,

			get_block_t *get_block)

{

fs/ext2/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -917,7 +917,7 @@ ext2_nobh_write_begin(struct file *file, struct address_space *mapping, 
{

	int ret;



	ret = nobh_write_begin(mapping, pos, len, flags, pagep, fsdata,

	ret = nobh_write_begin(mapping, pos, len, pagep, fsdata,

			       ext2_get_block);

	if (ret < 0)

		ext2_write_failed(mapping, pos + len);

fs/jfs/inode.c

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

	int ret;



	ret = nobh_write_begin(mapping, pos, len, flags, pagep, fsdata,

				jfs_get_block);

	ret = nobh_write_begin(mapping, pos, len, pagep, fsdata, jfs_get_block);

	if (unlikely(ret))

		jfs_write_failed(mapping, pos + len);

include/linux/buffer_head.h

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static inline vm_fault_t block_page_mkwrite_return(int err) 
}

sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *);

int block_truncate_page(struct address_space *, loff_t, get_block_t *);

int nobh_write_begin(struct address_space *, loff_t, unsigned, unsigned,

int nobh_write_begin(struct address_space *, loff_t, unsigned len,

				struct page **, void **, get_block_t*);

int nobh_write_end(struct file *, struct address_space *,

				loff_t, unsigned, unsigned,