mm: rename FOLL_MLOCK to FOLL_POPULATE

After commit a1fde08c74e9 ("VM: skip the stack guard page lookup in
get_user_pages only for mlock") FOLL_MLOCK has lost its original
meaning: we don't necessarily mlock the page if the flags is set -- we
also take VM_LOCKED into consideration.

Since we use the same codepath for __mm_populate(), let's rename
FOLL_MLOCK to FOLL_POPULATE.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Michel Lespinasse <walken@google.com>
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>

3 files changed, 5 insertions, 5 deletions

diff --git a/mm/gup.c b/mm/gup.c
index a6e24e246f86..1b114ba9aebf 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -92,7 +92,7 @@ retry:
                  */
                 mark_page_accessed(page);
         }
-        if ((flags & FOLL_MLOCK) && (vma->vm_flags & VM_LOCKED)) {
+        if ((flags & FOLL_POPULATE) && (vma->vm_flags & VM_LOCKED)) {
                 /*
                  * The preliminary mapping check is mainly to avoid the
                  * pointless overhead of lock_page on the ZERO_PAGE
@@ -265,8 +265,8 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
         unsigned int fault_flags = 0;
         int ret;
 
-        /* For mlock, just skip the stack guard page. */
-        if ((*flags & FOLL_MLOCK) &&
+        /* For mm_populate(), just skip the stack guard page. */
+        if ((*flags & FOLL_POPULATE) &&
                         (stack_guard_page_start(vma, address) ||
                          stack_guard_page_end(vma, address + PAGE_SIZE)))
                 return -ENOENT;
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 6817b0350c71..10a4b6cea0d1 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1231,7 +1231,7 @@ struct page *follow_trans_huge_pmd(struct vm_area_struct *vma,
                                           pmd, _pmd,  1))
                         update_mmu_cache_pmd(vma, addr, pmd);
         }
-        if ((flags & FOLL_MLOCK) && (vma->vm_flags & VM_LOCKED)) {
+        if ((flags & FOLL_POPULATE) && (vma->vm_flags & VM_LOCKED)) {
                 if (page->mapping && trylock_page(page)) {
                         lru_add_drain();
                         if (page->mapping)
diff --git a/mm/mlock.c b/mm/mlock.c
index 8a54cd214925..f756e28b33fc 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -237,7 +237,7 @@ long __mlock_vma_pages_range(struct vm_area_struct *vma,
         VM_BUG_ON_VMA(end   > vma->vm_end, vma);
         VM_BUG_ON_MM(!rwsem_is_locked(&mm->mmap_sem), mm);
 
-        gup_flags = FOLL_TOUCH | FOLL_MLOCK;
+        gup_flags = FOLL_TOUCH | FOLL_POPULATE;
         /*
          * We want to touch writable mappings with a write fault in order
          * to break COW, except for shared mappings because these don't COW