From: Nick Piggin Subject: [patch 2/4] minix convert to new aops fix Date: Tue, 24 Jul 2007 14:07:11 +0200 Message-ID: <20070724120711.GB10830@wotan.suse.de> References: <20070724120604.GA10830@wotan.suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: Andrew Morton , Hugh Dickins , linux-fsdevel@vger.kernel.org Return-path: Received: from ns.suse.de ([195.135.220.2]:50373 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754098AbXGXMHM (ORCPT ); Tue, 24 Jul 2007 08:07:12 -0400 Content-Disposition: inline In-Reply-To: <20070724120604.GA10830@wotan.suse.de> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Signed-off-by: Nick Piggin Index: linux-2.6/fs/minix/dir.c =================================================================== --- linux-2.6.orig/fs/minix/dir.c +++ linux-2.6/fs/minix/dir.c @@ -311,7 +311,7 @@ int minix_delete_entry(struct minix_dir_ struct address_space *mapping = page->mapping; struct inode *inode = (struct inode*)mapping->host; char *kaddr = page_address(page); - loff_t pos = (page->index << PAGE_CACHE_SHIFT) + (char*)de - kaddr; + loff_t pos = page_offset(page) + (char*)de - kaddr; unsigned len = minix_sb(inode->i_sb)->s_dirsize; int err; @@ -435,7 +435,7 @@ void minix_set_link(struct minix_dir_ent struct address_space *mapping = page->mapping; struct inode *dir = mapping->host; struct minix_sb_info *sbi = minix_sb(dir->i_sb); - loff_t pos = (page->index << PAGE_CACHE_SHIFT) + + loff_t pos = page_offset(page) + (char *)de-(char*)page_address(page); int err;