]> git.baikalelectronics.ru Git - kernel.git/commitdiff
mm/mlock: drop dead code in count_mm_mlocked_page_nr()
authorLiam Howlett <liam.howlett@oracle.com>
Wed, 15 Jun 2022 17:40:58 +0000 (17:40 +0000)
committerAndrew Morton <akpm@linux-foundation.org>
Tue, 27 Sep 2022 02:46:27 +0000 (19:46 -0700)
The check for mm being null has never been needed since the only caller
has always passed in current->mm.  Remove the check from
count_mm_mlocked_page_nr().

Link: https://lkml.kernel.org/r/20220615174050.738523-1-Liam.Howlett@oracle.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Suggested-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/mlock.c

index 43d19a1f28eb37cbc66a309e83a4fb31cff07019..7032f6dd0ce198301598ef4811864f83bb5c2c47 100644 (file)
@@ -531,14 +531,12 @@ static unsigned long count_mm_mlocked_page_nr(struct mm_struct *mm,
        unsigned long end;
        VMA_ITERATOR(vmi, mm, start);
 
-       if (mm == NULL)
-               mm = current->mm;
-
        /* Don't overflow past ULONG_MAX */
        if (unlikely(ULONG_MAX - len < start))
                end = ULONG_MAX;
        else
                end = start + len;
+
        for_each_vma_range(vmi, vma, end) {
                if (vma->vm_flags & VM_LOCKED) {
                        if (start > vma->vm_start)