Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752786Ab3COHJx (ORCPT ); Fri, 15 Mar 2013 03:09:53 -0400 Received: from mail-ob0-f172.google.com ([209.85.214.172]:57554 "EHLO mail-ob0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751278Ab3COHJw (ORCPT ); Fri, 15 Mar 2013 03:09:52 -0400 MIME-Version: 1.0 In-Reply-To: <1363283435-7666-24-git-send-email-kirill.shutemov@linux.intel.com> References: <1363283435-7666-1-git-send-email-kirill.shutemov@linux.intel.com> <1363283435-7666-24-git-send-email-kirill.shutemov@linux.intel.com> Date: Fri, 15 Mar 2013 15:09:50 +0800 Message-ID: Subject: Re: [PATCHv2, RFC 23/30] thp: prepare zap_huge_pmd() to uncharge file pages From: Hillf Danton To: "Kirill A. Shutemov" Cc: Andrea Arcangeli , Andrew Morton , Al Viro , Hugh Dickins , Wu Fengguang , Jan Kara , Mel Gorman , linux-mm@kvack.org, Andi Kleen , Matthew Wilcox , "Kirill A. Shutemov" , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1617 Lines: 39 On Fri, Mar 15, 2013 at 1:50 AM, Kirill A. Shutemov wrote: > From: "Kirill A. Shutemov" > > Uncharge pages from correct counter. > > Signed-off-by: Kirill A. Shutemov > --- > mm/huge_memory.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index a23da8b..34e0385 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -1368,10 +1368,12 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, > spin_unlock(&tlb->mm->page_table_lock); > put_huge_zero_page(); > } else { > + int counter; s/counter/item/ ? > page = pmd_page(orig_pmd); > page_remove_rmap(page); > VM_BUG_ON(page_mapcount(page) < 0); > - add_mm_counter(tlb->mm, MM_ANONPAGES, -HPAGE_PMD_NR); > + counter = PageAnon(page) ? MM_ANONPAGES : MM_FILEPAGES; > + add_mm_counter(tlb->mm, counter, -HPAGE_PMD_NR); > VM_BUG_ON(!PageHead(page)); > tlb->mm->nr_ptes--; > spin_unlock(&tlb->mm->page_table_lock); > -- > 1.7.10.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/