LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] mm/memcg: Drop swp_entry_t* in mc_handle_file_pte()
@ 2021-09-16 19:30 Peter Xu
  2021-09-17  3:17 ` Muchun Song
  2021-09-17 10:44 ` David Hildenbrand
  0 siblings, 2 replies; 3+ messages in thread
From: Peter Xu @ 2021-09-16 19:30 UTC (permalink / raw)
  To: linux-kernel, linux-mm; +Cc: Andrew Morton, peterx, Matthew Wilcox

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

Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
 mm/memcontrol.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index b762215d73eb..12fa08e216a6 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -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;
-- 
2.31.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] mm/memcg: Drop swp_entry_t* in mc_handle_file_pte()
  2021-09-16 19:30 [PATCH] mm/memcg: Drop swp_entry_t* in mc_handle_file_pte() Peter Xu
@ 2021-09-17  3:17 ` Muchun Song
  2021-09-17 10:44 ` David Hildenbrand
  1 sibling, 0 replies; 3+ messages in thread
From: Muchun Song @ 2021-09-17  3:17 UTC (permalink / raw)
  To: Peter Xu
  Cc: LKML, Linux Memory Management List, Andrew Morton, Matthew Wilcox

On Fri, Sep 17, 2021 at 3:30 AM Peter Xu <peterx@redhat.com> wrote:
>
> After the rework of f5df8635c5a3 ("mm: use find_get_incore_page in memcontrol",
> 2020-10-13) it's unused.
>
> Cc: Matthew Wilcox <willy@infradead.org>
> Signed-off-by: Peter Xu <peterx@redhat.com>

LGTM.

Reviewed-by: Muchun Song <songmuchun@bytedance.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] mm/memcg: Drop swp_entry_t* in mc_handle_file_pte()
  2021-09-16 19:30 [PATCH] mm/memcg: Drop swp_entry_t* in mc_handle_file_pte() Peter Xu
  2021-09-17  3:17 ` Muchun Song
@ 2021-09-17 10:44 ` David Hildenbrand
  1 sibling, 0 replies; 3+ messages in thread
From: David Hildenbrand @ 2021-09-17 10:44 UTC (permalink / raw)
  To: Peter Xu, linux-kernel, linux-mm; +Cc: Andrew Morton, Matthew Wilcox

On 16.09.21 21:30, Peter Xu wrote:
> After the rework of f5df8635c5a3 ("mm: use find_get_incore_page in memcontrol",
> 2020-10-13) it's unused.
> 
> Cc: Matthew Wilcox <willy@infradead.org>
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
>   mm/memcontrol.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index b762215d73eb..12fa08e216a6 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -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;
> 

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 
Thanks,

David / dhildenb


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-09-17 10:44 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-16 19:30 [PATCH] mm/memcg: Drop swp_entry_t* in mc_handle_file_pte() Peter Xu
2021-09-17  3:17 ` Muchun Song
2021-09-17 10:44 ` David Hildenbrand

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).