mm: drop zap_details::check_swap_entries

detail == NULL would give the same functionality as
.check_swap_entries==true.

Link: http://lkml.kernel.org/r/20170118122429.43661-2-kirill.shutemov@linux.intel.com
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index eae478a42f26769d050472c17a15f39ad10f1f52..062936e8b832c38fa72ea701707667651d9ae533 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1175,7 +1175,6 @@ struct zap_details {
        struct address_space *check_mapping;    /* Check page->mapping if set */
        pgoff_t first_index;                    /* Lowest page->index to unmap */
        pgoff_t last_index;                     /* Highest page->index to unmap */
-       bool check_swap_entries;                /* Check also swap entries */
 };
 
 struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr,

diff --git a/mm/memory.c b/mm/memory.c
index 88872a93c3caee54c5e67e7d11f92bebafcd31d7..e9035a0afee20e15c7a4b5ab3797dbfce358e8b8 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1173,8 +1173,8 @@ again:
                        }
                        continue;
                }
-               /* only check swap_entries if explicitly asked for in details */
-               if (unlikely(details && !details->check_swap_entries))
+               /* If details->check_mapping, we leave swap entries. */
+               if (unlikely(details))
                        continue;
 
                entry = pte_to_swp_entry(ptent);

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 33fcc8a40aeb6d3cc782bb7ea95d2689900aa924..a1977247c7ea5276c82e7fcd7bc55f6e633cda78 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -465,7 +465,6 @@ static bool __oom_reap_task_mm(struct task_struct *tsk, struct mm_struct *mm)
 {
        struct mmu_gather tlb;
        struct vm_area_struct *vma;
-       struct zap_details details = {.check_swap_entries = true};
        bool ret = true;
 
        /*
@@ -531,7 +530,7 @@ static bool __oom_reap_task_mm(struct task_struct *tsk, struct mm_struct *mm)
                 */
                if (vma_is_anonymous(vma) || !(vma->vm_flags & VM_SHARED))
                        unmap_page_range(&tlb, vma, vma->vm_start, vma->vm_end,
-                                        &details);
+                                        NULL);
        }
        tlb_finish_mmu(&tlb, 0, -1);
        pr_info("oom_reaper: reaped process %d (%s), now anon-rss:%lukB, file-rss:%lukB, shmem-rss:%lukB\n",