diff options
| author | Nick Piggin | 2007-10-16 01:25:23 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2007-10-16 09:42:57 -0700 |
| commit | b4585729f0b616c95aacafb8c8cb5e1af0d4242f (patch) | |
| tree | d87045fed9cf165dca1e3e41802f5c2f7e2bbf09 | |
| parent | d5c5f84ba9b9138b03ba90f1b7f83a379cfaea6a (diff) | |
fs: adfs convert to new aops
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/adfs/inode.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/fs/adfs/inode.c b/fs/adfs/inode.c index 7e7a04be1278..e647200262a2 100644 --- a/fs/adfs/inode.c +++ b/fs/adfs/inode.c @@ -61,10 +61,14 @@ static int adfs_readpage(struct file *file, struct page *page) return block_read_full_page(page, adfs_get_block); } -static int adfs_prepare_write(struct file *file, struct page *page, unsigned int from, unsigned int to) +static int adfs_write_begin(struct file *file, struct address_space *mapping, + loff_t pos, unsigned len, unsigned flags, + struct page **pagep, void **fsdata) { - return cont_prepare_write(page, from, to, adfs_get_block, - &ADFS_I(page->mapping->host)->mmu_private); + *pagep = NULL; + return cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata, + adfs_get_block, + &ADFS_I(mapping->host)->mmu_private); } static sector_t _adfs_bmap(struct address_space *mapping, sector_t block) @@ -76,8 +80,8 @@ static const struct address_space_operations adfs_aops = { .readpage = adfs_readpage, .writepage = adfs_writepage, .sync_page = block_sync_page, - .prepare_write = adfs_prepare_write, - .commit_write = generic_commit_write, + .write_begin = adfs_write_begin, + .write_end = generic_write_end, .bmap = _adfs_bmap }; |