diff options
| author | Nick Piggin <npiggin@suse.de> | 2007-10-16 01:25:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 09:42:56 -0700 |
| commit | f87061842877cf822251c65b39cc624cc94046da (patch) | |
| tree | d1d5b57b32ced0e4ac657ca1aee2ecdbec57bb77 | |
| parent | eedcbba5e012978ec1bf972723aa02ab4df972e6 (diff) | |
| download | linux-3.10-f87061842877cf822251c65b39cc624cc94046da.tar.gz linux-3.10-f87061842877cf822251c65b39cc624cc94046da.tar.bz2 linux-3.10-f87061842877cf822251c65b39cc624cc94046da.zip | |
qnx4: convert to new aops
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>
| -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 1bc8d873a9e..df8bd87e49b 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) { 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 }; |