diff options
-rw-r--r-- | mm/migrate.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index 09f6e4aa87fc..20b95db63da5 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
@@ -16,8 +16,7 @@ | |||
16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
17 | #include <linux/swap.h> | 17 | #include <linux/swap.h> |
18 | #include <linux/pagemap.h> | 18 | #include <linux/pagemap.h> |
19 | #include <linux/buffer_head.h> /* for try_to_release_page(), | 19 | #include <linux/buffer_head.h> |
20 | buffer_heads_over_limit */ | ||
21 | #include <linux/mm_inline.h> | 20 | #include <linux/mm_inline.h> |
22 | #include <linux/pagevec.h> | 21 | #include <linux/pagevec.h> |
23 | #include <linux/rmap.h> | 22 | #include <linux/rmap.h> |
@@ -28,8 +27,6 @@ | |||
28 | 27 | ||
29 | #include "internal.h" | 28 | #include "internal.h" |
30 | 29 | ||
31 | #include "internal.h" | ||
32 | |||
33 | /* The maximum number of pages to take off the LRU for migration */ | 30 | /* The maximum number of pages to take off the LRU for migration */ |
34 | #define MIGRATE_CHUNK_SIZE 256 | 31 | #define MIGRATE_CHUNK_SIZE 256 |
35 | 32 | ||
@@ -234,7 +231,7 @@ int migrate_page_remove_references(struct page *newpage, | |||
234 | if (!page_mapping(page) || page_count(page) != nr_refs || | 231 | if (!page_mapping(page) || page_count(page) != nr_refs || |
235 | *radix_pointer != page) { | 232 | *radix_pointer != page) { |
236 | write_unlock_irq(&mapping->tree_lock); | 233 | write_unlock_irq(&mapping->tree_lock); |
237 | return 1; | 234 | return -EAGAIN; |
238 | } | 235 | } |
239 | 236 | ||
240 | /* | 237 | /* |