From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Lameter Subject: [patch 05/18] Use page_cache_xxx in mm/rmap.c Date: Wed, 26 Dec 2007 21:32:51 -0800 Message-ID: <20071227053400.750715035@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]:53776 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750890AbXL0FeB (ORCPT ); Thu, 27 Dec 2007 00:34:01 -0500 Cc: David Chinner Content-Disposition: inline; filename=0006-Use-page_cache_xxx-in-mm-rmap.c.patch Sender: linux-fsdevel-owner@vger.kernel.org List-ID: V2->V3: - vma_address(): Check for truncation if this is a file based page. return -EFAULT if truncation occurred. - page_referenced_file(): Only use mapping after we have made sure that the mapping is valid and the page is locked. Use page_cache_xxx in mm/rmap.c Reviewed-by: Dave Chinner Signed-off-by: Christoph Lameter --- mm/rmap.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) Index: linux-2.6.24-rc6-mm1/mm/rmap.c =================================================================== --- linux-2.6.24-rc6-mm1.orig/mm/rmap.c 2007-12-26 20:35:03.773114182 -0800 +++ linux-2.6.24-rc6-mm1/mm/rmap.c 2007-12-26 20:40:28.693800636 -0800 @@ -190,9 +190,21 @@ static void page_unlock_anon_vma(struct static inline unsigned long vma_address(struct page *page, struct vm_area_struct *vma) { - pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); + pgoff_t pgoff; unsigned long address; + if (PageAnon(page)) + pgoff = page->index; + else { + struct address_space *mapping = page->mapping; + + if (!mapping) + /* Page was truncated */ + return -EFAULT; + + pgoff = page->index << mapping_order(mapping); + } + address = vma->vm_start + ((pgoff - vma->vm_pgoff) << PAGE_SHIFT); if (unlikely(address < vma->vm_start || address >= vma->vm_end)) { /* page should be within @vma mapping range */ @@ -348,7 +360,7 @@ static int page_referenced_file(struct p { unsigned int mapcount; struct address_space *mapping = page->mapping; - pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); + pgoff_t pgoff; struct vm_area_struct *vma; struct prio_tree_iter iter; int referenced = 0; @@ -368,6 +380,9 @@ static int page_referenced_file(struct p */ BUG_ON(!PageLocked(page)); + /* Safe to use mapping */ + pgoff = page->index << mapping_order(mapping); + spin_lock(&mapping->i_mmap_lock); /* @@ -467,7 +482,7 @@ out: static int page_mkclean_file(struct address_space *mapping, struct page *page) { - pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); + pgoff_t pgoff = page->index << mapping_order(mapping); struct vm_area_struct *vma; struct prio_tree_iter iter; int ret = 0; @@ -900,7 +915,7 @@ static int try_to_unmap_anon(struct page static int try_to_unmap_file(struct page *page, int migration) { struct address_space *mapping = page->mapping; - pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); + pgoff_t pgoff = page->index << mapping_order(mapping); struct vm_area_struct *vma; struct prio_tree_iter iter; int ret = SWAP_AGAIN; --