On Sun, May 12, 2013 at 9:23 AM, Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx> wrote: > From: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx> > > Since we're going to have huge pages in page cache, we need to call > adjust file-backed VMA, which potentially can contain huge pages. > > For now we call it for all VMAs. > > Probably later we will need to introduce a flag to indicate that the VMA > has huge pages. > > Signed-off-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx> > --- Acked-by: Hillf Danton <dhillf@xxxxxxxxx> > include/linux/huge_mm.h | 11 +---------- > mm/huge_memory.c | 2 +- > 2 files changed, 2 insertions(+), 11 deletions(-) > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > index b20334a..f4d6626 100644 > --- a/include/linux/huge_mm.h > +++ b/include/linux/huge_mm.h > @@ -139,7 +139,7 @@ extern void split_huge_page_pmd_mm(struct mm_struct *mm, unsigned long address, > #endif > extern int hugepage_madvise(struct vm_area_struct *vma, > unsigned long *vm_flags, int advice); > -extern void __vma_adjust_trans_huge(struct vm_area_struct *vma, > +extern void vma_adjust_trans_huge(struct vm_area_struct *vma, > unsigned long start, > unsigned long end, > long adjust_next); > @@ -155,15 +155,6 @@ static inline int pmd_trans_huge_lock(pmd_t *pmd, > else > return 0; > } > -static inline void vma_adjust_trans_huge(struct vm_area_struct *vma, > - unsigned long start, > - unsigned long end, > - long adjust_next) > -{ > - if (!vma->anon_vma || vma->vm_ops) > - return; > - __vma_adjust_trans_huge(vma, start, end, adjust_next); > -} > static inline int hpage_nr_pages(struct page *page) > { > if (unlikely(PageTransHuge(page))) > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index d7c9df5..9c3815b 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -2783,7 +2783,7 @@ static void split_huge_page_address(struct mm_struct *mm, > split_huge_page_pmd_mm(mm, address, pmd); > } > > -void __vma_adjust_trans_huge(struct vm_area_struct *vma, > +void vma_adjust_trans_huge(struct vm_area_struct *vma, > unsigned long start, > unsigned long end, > long adjust_next) > -- > 1.7.10.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html