From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Lameter Subject: [patch 08/18] Use page_cache_xxx in fs/libfs.c Date: Wed, 26 Dec 2007 21:32:54 -0800 Message-ID: <20071227053401.429081553@sgi.com> References: <20071227053246.902699851@sgi.com> Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org To: akpm@linux-foundation.org Return-path: Received: from relay2.sgi.com ([192.48.171.30]:53788 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751097AbXL0FeB (ORCPT ); Thu, 27 Dec 2007 00:34:01 -0500 Cc: David Chinner Content-Disposition: inline; filename=0009-Use-page_cache_xxx-in-fs-libfs.c.patch Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Use page_cache_xxx in fs/libfs.c Reviewed-by: Dave Chinner Signed-off-by: Christoph Lameter --- fs/libfs.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) Index: linux-2.6.24-rc6-mm1/fs/libfs.c =================================================================== --- linux-2.6.24-rc6-mm1.orig/fs/libfs.c 2007-12-26 17:47:02.519408561 -0800 +++ linux-2.6.24-rc6-mm1/fs/libfs.c 2007-12-26 19:51:07.826143940 -0800 @@ -17,7 +17,8 @@ int simple_getattr(struct vfsmount *mnt, { 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; } @@ -341,10 +342,10 @@ int simple_prepare_write(struct file *fi 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; } @@ -372,8 +373,9 @@ int simple_write_begin(struct file *file static 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); --