]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
qnx4: convert to new aops
authorNick Piggin <npiggin@suse.de>
Tue, 16 Oct 2007 08:25:12 +0000 (01:25 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 16 Oct 2007 16:42:56 +0000 (09:42 -0700)
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: Anders Larsen <al@alarsen.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/qnx4/inode.c

index 1bc8d873a9e17ff20cfa7e550ed3b947ca87500a..df8bd87e49b724f3014f65245aa48922792c58c8 100644 (file)
@@ -433,16 +433,21 @@ static int qnx4_writepage(struct page *page, struct writeback_control *wbc)
 {
        return block_write_full_page(page,qnx4_get_block, wbc);
 }
+
 static int qnx4_readpage(struct file *file, struct page *page)
 {
        return block_read_full_page(page,qnx4_get_block);
 }
-static int qnx4_prepare_write(struct file *file, struct page *page,
-                             unsigned from, unsigned to)
+
+static int qnx4_write_begin(struct file *file, struct address_space *mapping,
+                       loff_t pos, unsigned len, unsigned flags,
+                       struct page **pagep, void **fsdata)
 {
-       struct qnx4_inode_info *qnx4_inode = qnx4_i(page->mapping->host);
-       return cont_prepare_write(page, from, to, qnx4_get_block,
-                                 &qnx4_inode->mmu_private);
+       struct qnx4_inode_info *qnx4_inode = qnx4_i(mapping->host);
+       *pagep = NULL;
+       return cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
+                               qnx4_get_block,
+                               &qnx4_inode->mmu_private);
 }
 static sector_t qnx4_bmap(struct address_space *mapping, sector_t block)
 {
@@ -452,8 +457,8 @@ static const struct address_space_operations qnx4_aops = {
        .readpage       = qnx4_readpage,
        .writepage      = qnx4_writepage,
        .sync_page      = block_sync_page,
-       .prepare_write  = qnx4_prepare_write,
-       .commit_write   = generic_commit_write,
+       .write_begin    = qnx4_write_begin,
+       .write_end      = generic_write_end,
        .bmap           = qnx4_bmap
 };