diff options
-rw-r--r-- | fs/qnx4/inode.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index 1bc8d873a9e1..df8bd87e49b7 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c | |||
@@ -433,16 +433,21 @@ static int qnx4_writepage(struct page *page, struct writeback_control *wbc) | |||
433 | { | 433 | { |
434 | return block_write_full_page(page,qnx4_get_block, wbc); | 434 | return block_write_full_page(page,qnx4_get_block, wbc); |
435 | } | 435 | } |
436 | |||
436 | static int qnx4_readpage(struct file *file, struct page *page) | 437 | static int qnx4_readpage(struct file *file, struct page *page) |
437 | { | 438 | { |
438 | return block_read_full_page(page,qnx4_get_block); | 439 | return block_read_full_page(page,qnx4_get_block); |
439 | } | 440 | } |
440 | static int qnx4_prepare_write(struct file *file, struct page *page, | 441 | |
441 | unsigned from, unsigned to) | 442 | static int qnx4_write_begin(struct file *file, struct address_space *mapping, |
443 | loff_t pos, unsigned len, unsigned flags, | ||
444 | struct page **pagep, void **fsdata) | ||
442 | { | 445 | { |
443 | struct qnx4_inode_info *qnx4_inode = qnx4_i(page->mapping->host); | 446 | struct qnx4_inode_info *qnx4_inode = qnx4_i(mapping->host); |
444 | return cont_prepare_write(page, from, to, qnx4_get_block, | 447 | *pagep = NULL; |
445 | &qnx4_inode->mmu_private); | 448 | return cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata, |
449 | qnx4_get_block, | ||
450 | &qnx4_inode->mmu_private); | ||
446 | } | 451 | } |
447 | static sector_t qnx4_bmap(struct address_space *mapping, sector_t block) | 452 | static sector_t qnx4_bmap(struct address_space *mapping, sector_t block) |
448 | { | 453 | { |
@@ -452,8 +457,8 @@ static const struct address_space_operations qnx4_aops = { | |||
452 | .readpage = qnx4_readpage, | 457 | .readpage = qnx4_readpage, |
453 | .writepage = qnx4_writepage, | 458 | .writepage = qnx4_writepage, |
454 | .sync_page = block_sync_page, | 459 | .sync_page = block_sync_page, |
455 | .prepare_write = qnx4_prepare_write, | 460 | .write_begin = qnx4_write_begin, |
456 | .commit_write = generic_commit_write, | 461 | .write_end = generic_write_end, |
457 | .bmap = qnx4_bmap | 462 | .bmap = qnx4_bmap |
458 | }; | 463 | }; |
459 | 464 | ||