From mboxrd@z Thu Jan 1 00:00:00 1970 From: npiggin@suse.de Subject: [patch 23/41] adfs convert to new aops. Date: Mon, 14 May 2007 16:06:42 +1000 Message-ID: <20070514060653.514462000@wotan.suse.de> References: <20070514060619.689648000@wotan.suse.de> Cc: linux-fsdevel@vger.kernel.org, rmk@arm.linux.org.uk To: Andrew Morton Return-path: Received: from cantor.suse.de ([195.135.220.2]:53985 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752276AbXENIYN (ORCPT ); Mon, 14 May 2007 04:24:13 -0400 Content-Disposition: inline; filename=fs-adfs-aops.patch Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Cc: rmk@arm.linux.org.uk Cc: Linux Filesystems Signed-off-by: Nick Piggin fs/adfs/inode.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) Index: linux-2.6/fs/adfs/inode.c =================================================================== --- linux-2.6.orig/fs/adfs/inode.c +++ linux-2.6/fs/adfs/inode.c @@ -61,10 +61,14 @@ static int adfs_readpage(struct file *fi 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_operat .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 }; --