Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / fs / bfs / file.c

diff --git a/fs/bfs/file.c b/fs/bfs/file.c
index 24310e9ee05ad343245c0d9e881f150006c8e69f..911b4ccf470f4d4d0bd4bb77199f67a7f0cd3ca0 100644 (file)
--- a/fs/bfs/file.c
+++ b/fs/bfs/file.c
@@ -145,9 +145,13 @@ static int bfs_readpage(struct file *file, struct page *page)
        return block_read_full_page(page, bfs_get_block);
 }
 
-static int bfs_prepare_write(struct file *file, struct page *page, unsigned from, unsigned to)
+static int bfs_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, bfs_get_block);
+       *pagep = NULL;
+       return block_write_begin(file, mapping, pos, len, flags,
+                                       pagep, fsdata, bfs_get_block);
 }
 
 static sector_t bfs_bmap(struct address_space *mapping, sector_t block)
@@ -159,8 +163,8 @@ const struct address_space_operations bfs_aops = {
        .readpage       = bfs_readpage,
        .writepage      = bfs_writepage,
        .sync_page      = block_sync_page,
-       .prepare_write  = bfs_prepare_write,
-       .commit_write   = generic_commit_write,
+       .write_begin    = bfs_write_begin,
+       .write_end      = generic_write_end,
        .bmap           = bfs_bmap,
 };