ext2: convert to new aops

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>

1 files changed, 13 insertions, 11 deletions

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 0079b2cd531..63ab02aa4c5 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -642,18 +642,21 @@ ext2_readpages(struct file *file, struct address_space *mapping,
         return mpage_readpages(mapping, pages, nr_pages, ext2_get_block);
 }
 
-static int
-ext2_prepare_write(struct file *file, struct page *page,
-                        unsigned from, unsigned to)
+int __ext2_write_begin(struct file *file, struct address_space *mapping,
+                loff_t pos, unsigned len, unsigned flags,
+                struct page **pagep, void **fsdata)
 {
-        return block_prepare_write(page,from,to,ext2_get_block);
+        return block_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
+                                                        ext2_get_block);
 }
 
 static int
-ext2_nobh_prepare_write(struct file *file, struct page *page,
-                        unsigned from, unsigned to)
+ext2_write_begin(struct file *file, struct address_space *mapping,
+                loff_t pos, unsigned len, unsigned flags,
+                struct page **pagep, void **fsdata)
 {
-        return nobh_prepare_write(page,from,to,ext2_get_block);
+        *pagep = NULL;
+        return __ext2_write_begin(file, mapping, pos, len, flags, pagep,fsdata);
 }
 
 static int ext2_nobh_writepage(struct page *page,
@@ -689,8 +692,8 @@ const struct address_space_operations ext2_aops = {
         .readpages              = ext2_readpages,
         .writepage              = ext2_writepage,
         .sync_page              = block_sync_page,
-        .prepare_write          = ext2_prepare_write,
-        .commit_write           = generic_commit_write,
+        .write_begin            = ext2_write_begin,
+        .write_end              = generic_write_end,
         .bmap                   = ext2_bmap,
         .direct_IO              = ext2_direct_IO,
         .writepages             = ext2_writepages,
@@ -707,8 +710,7 @@ const struct address_space_operations ext2_nobh_aops = {
         .readpages              = ext2_readpages,
         .writepage              = ext2_nobh_writepage,
         .sync_page              = block_sync_page,
-        .prepare_write          = ext2_nobh_prepare_write,
-        .commit_write           = nobh_commit_write,
+        /* XXX: todo */
         .bmap                   = ext2_bmap,
         .direct_IO              = ext2_direct_IO,
         .writepages             = ext2_writepages,