summaryrefslogtreecommitdiff
path: root/mm/mlock.c
diff options
context:
space:
mode:
authorLiam Howlett <liam.howlett@oracle.com>2022-06-15 17:40:58 +0000
committerAndrew Morton <akpm@linux-foundation.org>2022-09-26 19:46:27 -0700
commit66071896cdfe096fcd4aef55a5efbd5216fa15de (patch)
tree363a7790ce6dfdb99cc47524aac98e4f95bf3759 /mm/mlock.c
parentc154124fe925a451e471233aa7d1ab9a91f0a5ad (diff)
downloadlwn-66071896cdfe096fcd4aef55a5efbd5216fa15de.tar.gz
lwn-66071896cdfe096fcd4aef55a5efbd5216fa15de.zip
mm/mlock: drop dead code in count_mm_mlocked_page_nr()
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>
Diffstat (limited to 'mm/mlock.c')
-rw-r--r--mm/mlock.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/mm/mlock.c b/mm/mlock.c
index 43d19a1f28eb..7032f6dd0ce1 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -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)