nfsd4: don't try to map gid's in generic rpc code

[safe/jmp/linux-2.6] / mm / migrate.c

diff --git a/mm/migrate.c b/mm/migrate.c
index b535a2c..1a4bf48 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -68,7 +68,7 @@ int putback_lru_pages(struct list_head *l)
        list_for_each_entry_safe(page, page2, l, lru) {
                list_del(&page->lru);
                dec_zone_page_state(page, NR_ISOLATED_ANON +
-                                   !!page_is_file_cache(page));
+                               page_is_file_cache(page));
                putback_lru_page(page);
                count++;
        }
@@ -272,7 +272,7 @@ static int migrate_page_move_mapping(struct address_space *mapping,
        pslot = radix_tree_lookup_slot(&mapping->page_tree,
                                        page_index(page));
 
-       expected_count = 2 + !!page_has_private(page);
+       expected_count = 2 + page_has_private(page);
        if (page_count(page) != expected_count ||
                        (struct page *)radix_tree_deref_slot(pslot) != page) {
                spin_unlock_irq(&mapping->tree_lock);
@@ -675,7 +675,7 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private,
        }
 
        /* Establish migration ptes or remove ptes */
-       try_to_unmap(page, 1);
+       try_to_unmap(page, TTU_MIGRATION|TTU_IGNORE_MLOCK|TTU_IGNORE_ACCESS);
 
 skip_unmap:
        if (!page_mapped(page))
@@ -701,7 +701,7 @@ unlock:
                 */
                list_del(&page->lru);
                dec_zone_page_state(page, NR_ISOLATED_ANON +
-                                   !!page_is_file_cache(page));
+                               page_is_file_cache(page));
                putback_lru_page(page);
        }
 
@@ -751,7 +751,7 @@ int migrate_pages(struct list_head *from,
        local_irq_save(flags);
        list_for_each_entry(page, from, lru)
                __inc_zone_page_state(page, NR_ISOLATED_ANON +
-                                     !!page_is_file_cache(page));
+                               page_is_file_cache(page));
        local_irq_restore(flags);
 
        if (!swapwrite)