Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[deliverable/linux.git] / include / linux / hugetlb.h

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 7d953c2542a8f296fafbcb59b2bac323c7a64407..c26d4638f665e4caed44686fab6ac67bfa6c336c 100644 (file)
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -338,6 +338,7 @@ int huge_add_to_page_cache(struct page *page, struct address_space *mapping,
 /* arch callback */
 int __init alloc_bootmem_huge_page(struct hstate *h);
 
+void __init hugetlb_bad_size(void);
 void __init hugetlb_add_hstate(unsigned order);
 struct hstate *size_to_hstate(unsigned long size);
 
@@ -352,9 +353,7 @@ extern unsigned int default_hstate_idx;
 
 static inline struct hstate *hstate_inode(struct inode *i)
 {
-       struct hugetlbfs_sb_info *hsb;
-       hsb = HUGETLBFS_SB(i->i_sb);
-       return hsb->hstate;
+       return HUGETLBFS_SB(i->i_sb)->hstate;
 }
 
 static inline struct hstate *hstate_file(struct file *f)
@@ -453,12 +452,12 @@ static inline pgoff_t basepage_index(struct page *page)
 
 extern void dissolve_free_huge_pages(unsigned long start_pfn,
                                     unsigned long end_pfn);
-static inline int hugepage_migration_supported(struct hstate *h)
+static inline bool hugepage_migration_supported(struct hstate *h)
 {
 #ifdef CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION
        return huge_page_shift(h) == PMD_SHIFT;
 #else
-       return 0;
+       return false;
 #endif
 }
 
@@ -520,7 +519,7 @@ static inline pgoff_t basepage_index(struct page *page)
        return page->index;
 }
 #define dissolve_free_huge_pages(s, e) do {} while (0)
-#define hugepage_migration_supported(h)        0
+#define hugepage_migration_supported(h)        false
 
 static inline spinlock_t *huge_pte_lockptr(struct hstate *h,
                                           struct mm_struct *mm, pte_t *pte)