From: Nick Piggin Subject: [patch 4/4] ufs convert to new aops fix Date: Tue, 24 Jul 2007 14:08:23 +0200 Message-ID: <20070724120823.GD10830@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 cantor.suse.de ([195.135.220.2]:50444 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756811AbXGXMIY (ORCPT ); Tue, 24 Jul 2007 08:08:24 -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/ufs/dir.c =================================================================== --- linux-2.6.orig/fs/ufs/dir.c +++ linux-2.6/fs/ufs/dir.c @@ -89,7 +89,7 @@ ino_t ufs_inode_by_name(struct inode *di void ufs_set_link(struct inode *dir, struct ufs_dir_entry *de, struct page *page, struct inode *inode) { - loff_t pos = (page->index << PAGE_CACHE_SHIFT) + + loff_t pos = page_offset(page) + (char *) de - (char *) page_address(page); unsigned len = fs16_to_cpu(dir->i_sb, de->d_reclen); int err; @@ -379,7 +379,7 @@ int ufs_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); err = __ufs_write_begin(NULL, page->mapping, pos, rec_len, AOP_FLAG_UNINTERRUPTIBLE, &page, NULL); @@ -547,7 +547,7 @@ int ufs_delete_entry(struct inode *inode if (pde) from = (char*)pde - (char*)page_address(page); - pos = (page->index << PAGE_CACHE_SHIFT) + from; + pos = page_offset(page) + from; lock_page(page); err = __ufs_write_begin(NULL, mapping, pos, to - from, AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);