block: use revalidate_disk_size in set_capacity_revalidate_and_notify

[linux-2.6-microblaze.git] / include / linux / migrate.h

diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index 540998d..0f8d158 100644 (file)
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -10,6 +10,8 @@
 typedef struct page *new_page_t(struct page *page, unsigned long private);
 typedef void free_page_t(struct page *page, unsigned long private);
 
+struct migration_target_control;
+
 /*
  * Return values from addresss_space_operations.migratepage():
  * - negative errno on page migration failure;
@@ -31,34 +33,6 @@ enum migrate_reason {
 /* In mm/debug.c; also keep sync with include/trace/events/migrate.h */
 extern const char *migrate_reason_names[MR_TYPES];
 
-static inline struct page *new_page_nodemask(struct page *page,
-                               int preferred_nid, nodemask_t *nodemask)
-{
-       gfp_t gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL;
-       unsigned int order = 0;
-       struct page *new_page = NULL;
-
-       if (PageHuge(page))
-               return alloc_huge_page_nodemask(page_hstate(compound_head(page)),
-                               preferred_nid, nodemask);
-
-       if (PageTransHuge(page)) {
-               gfp_mask |= GFP_TRANSHUGE;
-               order = HPAGE_PMD_ORDER;
-       }
-
-       if (PageHighMem(page) || (zone_idx(page_zone(page)) == ZONE_MOVABLE))
-               gfp_mask |= __GFP_HIGHMEM;
-
-       new_page = __alloc_pages_nodemask(gfp_mask, order,
-                               preferred_nid, nodemask);
-
-       if (new_page && PageTransHuge(new_page))
-               prep_transhuge_page(new_page);
-
-       return new_page;
-}
-
 #ifdef CONFIG_MIGRATION
 
 extern void putback_movable_pages(struct list_head *l);
@@ -67,6 +41,7 @@ extern int migrate_page(struct address_space *mapping,
                        enum migrate_mode mode);
 extern int migrate_pages(struct list_head *l, new_page_t new, free_page_t free,
                unsigned long private, enum migrate_mode mode, int reason);
+extern struct page *alloc_migration_target(struct page *page, unsigned long private);
 extern int isolate_movable_page(struct page *page, isolate_mode_t mode);
 extern void putback_movable_page(struct page *page);
 
@@ -85,6 +60,9 @@ static inline int migrate_pages(struct list_head *l, new_page_t new,
                free_page_t free, unsigned long private, enum migrate_mode mode,
                int reason)
        { return -ENOSYS; }
+static inline struct page *alloc_migration_target(struct page *page,
+               unsigned long private)
+       { return NULL; }
 static inline int isolate_movable_page(struct page *page, isolate_mode_t mode)
        { return -EBUSY; }