jfs: convert to new aops

Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 10 insertions, 7 deletions

diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index 3467dde27e5a..6af378563611 100644
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -255,7 +255,7 @@ int jfs_get_block(struct inode *ip, sector_t lblock,
 
 static int jfs_writepage(struct page *page, struct writeback_control *wbc)
 {
-        return nobh_writepage(page, jfs_get_block, wbc);
+        return block_write_full_page(page, jfs_get_block, wbc);
 }
 
 static int jfs_writepages(struct address_space *mapping,
@@ -275,10 +275,13 @@ static int jfs_readpages(struct file *file, struct address_space *mapping,
         return mpage_readpages(mapping, pages, nr_pages, jfs_get_block);
 }
 
-static int jfs_prepare_write(struct file *file,
-                             struct page *page, unsigned from, unsigned to)
+static int jfs_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, jfs_get_block);
+        *pagep = NULL;
+        return block_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
+                                jfs_get_block);
 }
 
 static sector_t jfs_bmap(struct address_space *mapping, sector_t block)
@@ -302,8 +305,8 @@ const struct address_space_operations jfs_aops = {
         .writepage      = jfs_writepage,
         .writepages     = jfs_writepages,
         .sync_page      = block_sync_page,
-        .prepare_write  = jfs_prepare_write,
-        .commit_write   = nobh_commit_write,
+        .write_begin    = jfs_write_begin,
+        .write_end      = generic_write_end,
         .bmap           = jfs_bmap,
         .direct_IO      = jfs_direct_IO,
 };
@@ -356,7 +359,7 @@ void jfs_truncate(struct inode *ip)
 {
         jfs_info("jfs_truncate: size = 0x%lx", (ulong) ip->i_size);
 
-        nobh_truncate_page(ip->i_mapping, ip->i_size);
+        block_truncate_page(ip->i_mapping, ip->i_size, jfs_get_block);
 
         IWRITE_LOCK(ip, RDWRLOCK_NORMAL);
         jfs_truncate_nolock(ip, ip->i_size);