From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763268AbXH1TXv (ORCPT ); Tue, 28 Aug 2007 15:23:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760891AbXH1TJT (ORCPT ); Tue, 28 Aug 2007 15:09:19 -0400 Received: from netops-testserver-3-out.sgi.com ([192.48.171.28]:58709 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755130AbXH1THc (ORCPT ); Tue, 28 Aug 2007 15:07:32 -0400 Message-Id: <20070828190729.757330047@sgi.com> References: <20070828190551.415127746@sgi.com> User-Agent: quilt/0.46-1 Date: Tue, 28 Aug 2007 12:06:00 -0700 From: clameter@sgi.com To: torvalds@linux-foundation.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christoph Hellwig , Mel Gorman Cc: William Lee Irwin III , David Chinner Cc: Jens Axboe , Badari Pulavarty Cc: Maxim Levitsky , Fengguang Wu Cc: swin wang , totty.lu@gmail.com, "H. Peter Anvin" Cc: joern@lazybastard.org, "Eric W. Biederman" Subject: [09/36] Use page_cache_xxx in fs/libfs.c Content-Disposition: inline; filename=0009-Use-page_cache_xxx-in-fs-libfs.c.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Use page_cache_xxx in fs/libfs.c Signed-off-by: Christoph Lameter --- fs/libfs.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/fs/libfs.c b/fs/libfs.c index 53b3dc5..e90f894 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -16,7 +16,8 @@ int simple_getattr(struct vfsmount *mnt, struct dentry *dentry, { struct inode *inode = dentry->d_inode; generic_fillattr(inode, stat); - stat->blocks = inode->i_mapping->nrpages << (PAGE_CACHE_SHIFT - 9); + stat->blocks = inode->i_mapping->nrpages << + (page_cache_shift(inode->i_mapping) - 9); return 0; } @@ -340,10 +341,10 @@ int simple_prepare_write(struct file *file, struct page *page, unsigned from, unsigned to) { if (!PageUptodate(page)) { - if (to - from != PAGE_CACHE_SIZE) + if (to - from != page_cache_size(file->f_mapping)) zero_user_segments(page, 0, from, - to, PAGE_CACHE_SIZE); + to, page_cache_size(file->f_mapping)); } return 0; } @@ -351,8 +352,9 @@ int simple_prepare_write(struct file *file, struct page *page, int simple_commit_write(struct file *file, struct page *page, unsigned from, unsigned to) { - struct inode *inode = page->mapping->host; - loff_t pos = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to; + struct address_space *mapping = page->mapping; + struct inode *inode = mapping->host; + loff_t pos = page_cache_pos(mapping, page->index, to); if (!PageUptodate(page)) SetPageUptodate(page); -- 1.5.2.4 --