From: Nick Piggin Subject: [patch 3/4] sysv convert to new aops fix Date: Tue, 24 Jul 2007 14:07:46 +0200 Message-ID: <20070724120746.GC10830@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]:50403 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757697AbXGXMHr (ORCPT ); Tue, 24 Jul 2007 08:07:47 -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/sysv/dir.c =================================================================== --- linux-2.6.orig/fs/sysv/dir.c +++ linux-2.6/fs/sysv/dir.c @@ -219,7 +219,7 @@ int sysv_add_link(struct dentry *dentry, return -EINVAL; got_it: - pos = (page->index << PAGE_CACHE_SHIFT) + + pos = page_offset(page) + (char*)de - (char*)page_address(page); lock_page(page); err = __sysv_write_begin(NULL, page->mapping, pos, SYSV_DIRSIZE, @@ -246,7 +246,7 @@ int sysv_delete_entry(struct sysv_dir_en struct address_space *mapping = page->mapping; struct inode *inode = (struct inode*)mapping->host; char *kaddr = (char*)page_address(page); - loff_t pos = (page->index << PAGE_CACHE_SHIFT) + (char *)de - kaddr; + loff_t pos = page_offset(page) + (char *)de - kaddr; int err; lock_page(page); @@ -347,7 +347,7 @@ void sysv_set_link(struct sysv_dir_entry { struct address_space *mapping = page->mapping; struct inode *dir = mapping->host; - loff_t pos = (page->index << PAGE_CACHE_SHIFT) + + loff_t pos = page_offset(page) + (char *)de-(char*)page_address(page); int err;