Skip to contentSkip to conversation

mm/memcg: Drop swp_entry_t* in mc_handle_file_pte()

PATCH Applied Peter Xu 3 participants 3 messages Sep 16, 2021 – Sep 17, 2021

Subsystems (2)
lore
Share & tools
lore

Peter Xu

author
#0 lore raw

PATCH 1/1 mm/memcg: Drop swp_entry_t* in mc_handle_file_pte()

After the rework of f5df8635c5a3 ("mm: use find_get_incore_page in memcontrol", 2020-10-13) it's unused.

Cc Matthew Wilcox <[email protected]>
---
 mm/memcontrol.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
mm/memcontrol.c +2 -2
index b762215d73eb..12fa08e216a6 100644
@@ -5555,7 +5555,7 @@ static struct page *mc_handle_swap_pte(struct vm_area_struct *vma,
 #endif
 
 static struct page *mc_handle_file_pte(struct vm_area_struct *vma,
-			unsigned long addr, pte_t ptent, swp_entry_t *entry)
+			unsigned long addr, pte_t ptent)
 {
 	if (!vma->vm_file) /* anonymous vma */
 		return NULL;
@@ -5728,7 +5728,7 @@ static enum mc_target_type get_mctgt_type(struct vm_area_struct *vma,
 	else if (is_swap_pte(ptent))
 		page = mc_handle_swap_pte(vma, ptent, &ent);
 	else if (pte_none(ptent))
-		page = mc_handle_file_pte(vma, addr, ptent, &ent);
+		page = mc_handle_file_pte(vma, addr, ptent);
 
 	if (!page && !ent.val)
 		return ret;
Signature · 1 line
2.31.1
Reviewed-by on v1 1/1
#2 lore raw
In reply to Peter Xu
Quoted 24 lines · Peter Xu

After the rework of f5df8635c5a3 ("mm: use find_get_incore_page in memcontrol", 2020-10-13) it's unused.

Cc Matthew Wilcox <[email protected]>
---
  mm/memcontrol.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
mm/memcontrol.c +1 -1
index b762215d73eb..12fa08e216a6 100644
@@ -5555,7 +5555,7 @@ static struct page *mc_handle_swap_pte(struct vm_area_struct *vma,
  #endif
 
  static struct page *mc_handle_file_pte(struct vm_area_struct *vma,
-			unsigned long addr, pte_t ptent, swp_entry_t *entry)
+			unsigned long addr, pte_t ptent)
  {
  	if (!vma->vm_file) /* anonymous vma */
  		return NULL;

mm/memcontrol.c static enum mc_target_type get_mctgt_type(struct vm_area_struct *vma, · line 5734

Quoted 8 lines
mm/memcontrol.c +1 -1
@@ -5728,7 +5728,7 @@ static enum mc_target_type get_mctgt_type(struct vm_area_struct *vma,
  	else if (is_swap_pte(ptent))
  		page = mc_handle_swap_pte(vma, ptent, &ent);
  	else if (pte_none(ptent))
-		page = mc_handle_file_pte(vma, addr, ptent, &ent);
+		page = mc_handle_file_pte(vma, addr, ptent);
 
  	if (!page && !ent.val)
  		return ret;
Signature · 3 lines
Thanks,

David / dhildenb