fs: Remove aop flags parameter from nobh_write_begin()

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

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/buffer.c b/fs/buffer.c
index 0163021..02b50e3 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -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)
 {

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 9719293..bfa69c5 100644 (file)
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -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);

diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index d1943a7..e16f77b 100644 (file)
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -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);
 

diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 127b60f..6e5a640 100644 (file)
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -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,