mm-ksm-rename-get_ksm_page_flags-to-ksm_get_folio_flags.patch removed from -mm tree
The quilt patch titled
Subject: mm/ksm: rename get_ksm_page_flags to ksm_get_folio_flags
has been removed from the -mm tree. Its filename was
mm-ksm-rename-get_ksm_page_flags-to-ksm_get_folio_flags.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: mm/ksm: rename get_ksm_page_flags to ksm_get_folio_flags
Date: Thu, 11 Apr 2024 14:17:10 +0800
As we are removing get_ksm_page_flags(), make the flags match the new function name.
Signed-off-by David Hildenbrand <[email protected]>
Signed-off-by Alex Shi <[email protected]>
Reviewed-by Alex Shi <[email protected]>
Cc Andrea Arcangeli <[email protected]>
Cc Chris Wright <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Izik Eidus <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/ksm.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
mm/ksm.c renamed from mm/ksm.c~mm-ksm-rename-get_ksm_page_flags-to-ksm_get_folio_flags +16 -16
@@ -890,10 +890,10 @@ static void remove_node_from_stable_treefree_stable_node (stable_node); } -enum get_ksm_page_flags { -GET_KSM_PAGE_NOLOCK , -GET_KSM_PAGE_LOCK , -GET_KSM_PAGE_TRYLOCK +enum ksm_get_folio_flags { +KSM_GET_FOLIO_NOLOCK , +KSM_GET_FOLIO_LOCK , +KSM_GET_FOLIO_TRYLOCK };/*
@@ -916,7 +916,7 @@ enum get_ksm_page_flags {* is on its way to being freed; but it is an anomaly to bear in mind. */ static struct folio *ksm_get_folio (struct ksm_stable_node *stable_node, -enum get_ksm_page_flags flags) +enum ksm_get_folio_flags flags) {struct folio *folio;void *expected_mapping;
@@ -959,15 +959,15 @@ again: goto stale; } -if (flags ==GET_KSM_PAGE_TRYLOCK ) { +if (flags ==KSM_GET_FOLIO_TRYLOCK ) {if (!folio_trylock (folio)) {folio_put (folio);return ERR_PTR (-EBUSY ); } - }else if (flags ==GET_KSM_PAGE_LOCK ) + }else if (flags ==KSM_GET_FOLIO_LOCK )folio_lock (folio); -if (flags !=GET_KSM_PAGE_NOLOCK ) { +if (flags !=KSM_GET_FOLIO_NOLOCK ) {if (READ_ONCE (folio->mapping) != expected_mapping) {folio_unlock (folio);folio_put (folio);
@@ -1001,7 +1001,7 @@ static void remove_rmap_item_from_tree(sstruct folio *folio; stable_node = rmap_item->head; - folio =ksm_get_folio (stable_node,GET_KSM_PAGE_LOCK ); + folio =ksm_get_folio (stable_node,KSM_GET_FOLIO_LOCK );if (!folio) goto out;
@@ -1116,7 +1116,7 @@ static int remove_stable_node(struct ksmstruct folio *folio;int err; - folio =ksm_get_folio (stable_node,GET_KSM_PAGE_LOCK ); + folio =ksm_get_folio (stable_node,KSM_GET_FOLIO_LOCK );if (!folio) {/* * ksm_get_folio did remove_node_from_stable_tree itself.
@@ -1656,7 +1656,7 @@ static struct folio *stable_node_dup(str* stable_node parameter itself will be freed from * under us if it returns NULL. */ - folio =ksm_get_folio (dup,GET_KSM_PAGE_NOLOCK ); + folio =ksm_get_folio (dup,KSM_GET_FOLIO_NOLOCK );if (!folio)continue ; nr +=1 ;
@@ -1779,7 +1779,7 @@ static struct folio *__stable_node_chainif (!is_stable_node_chain (stable_node)) {if (is_page_sharing_candidate (stable_node)) { *_stable_node_dup = stable_node; -return ksm_get_folio (stable_node,GET_KSM_PAGE_NOLOCK ); +return ksm_get_folio (stable_node,KSM_GET_FOLIO_NOLOCK ); }/* * _stable_node_dup set to NULL means the stable_node
@@ -1887,7 +1887,7 @@ again:* fine to continue the walk. */ tree_folio =ksm_get_folio (stable_node_any, -GET_KSM_PAGE_NOLOCK ); +KSM_GET_FOLIO_NOLOCK ); }VM_BUG_ON (!stable_node_dup ^ !!stable_node_any);if (!tree_folio) {
@@ -1948,7 +1948,7 @@ again:* than kpage, but that involves more changes. */ tree_folio =ksm_get_folio (stable_node_dup, -GET_KSM_PAGE_TRYLOCK ); +KSM_GET_FOLIO_TRYLOCK );if (PTR_ERR (tree_folio) == -EBUSY )return ERR_PTR (-EBUSY );
@@ -2120,7 +2120,7 @@ again:* fine to continue the walk. */ tree_folio =ksm_get_folio (stable_node_any, -GET_KSM_PAGE_NOLOCK ); +KSM_GET_FOLIO_NOLOCK ); }VM_BUG_ON (!stable_node_dup ^ !!stable_node_any);if (!tree_folio) {
@@ -2611,7 +2611,7 @@ static struct ksm_rmap_item *scan_get_nelist_for_each_entry_safe (stable_node, next, &migrate_nodes, list) { folio =ksm_get_folio (stable_node, -GET_KSM_PAGE_NOLOCK ); +KSM_GET_FOLIO_NOLOCK );if (folio)folio_put (folio);cond_resched ();
_
Patches currently in -mm which might be from [email protected] are