Skip to contentSkip to conversation

mm-shmem-shmem_replace_page-remember-nr_shmem.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Aug 17, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/shmem: shmem_replace_page() remember NR_SHMEM
has been removed from the -mm tree. Its filename was
mm-shmem-shmem_replace_page-remember-nr_shmem.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Hugh Dickins <[email protected]>
Subject: mm/shmem: shmem_replace_page() remember NR_SHMEM
Date: Wed, 10 Aug 2022 22:06:33 -0700 (PDT)

Elsewhere, NR_SHMEM is updated at the same time as shmem NR_FILE_PAGES; but shmem_replace_page() was forgetting to do that - so NR_SHMEM stats could grow too big or too small, in those unusual cases when it's used.

---

 mm/shmem.c |    2 ++
 1 file changed, 2 insertions(+)
mm/shmem.c renamed from mm/shmem.c~mm-shmem-shmem_replace_page-remember-nr_shmem +2 -0
@@ -1659,7 +1659,9 @@ static int shmem_replace_page(struct pag
 		new = page_folio(newpage);
 		mem_cgroup_migrate(old, new);
 		__inc_lruvec_page_state(newpage, NR_FILE_PAGES);
+		__inc_lruvec_page_state(newpage, NR_SHMEM);
 		__dec_lruvec_page_state(oldpage, NR_FILE_PAGES);
+		__dec_lruvec_page_state(oldpage, NR_SHMEM);
 	}
 	xa_unlock_irq(&swap_mapping->i_pages);
 

_

Patches currently in -mm which might be from [email protected] are