From: Jérôme Glisse <jglisse@xxxxxxxxxx>
Set page->mapping to the page_ronly struct instead of stable_node
struct. There is no functional change as page_ronly is just a field
of stable_node.
Signed-off-by: Jérôme Glisse <jglisse@xxxxxxxxxx>
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
---
mm/ksm.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/mm/ksm.c b/mm/ksm.c
index 6085068fb8b3..52b0ae291d23 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -39,6 +39,7 @@
#include <linux/freezer.h>
#include <linux/oom.h>
#include <linux/numa.h>
+#include <linux/page_ronly.h>
#include <asm/tlbflush.h>
#include "internal.h"
@@ -126,6 +127,7 @@ struct ksm_scan {
/**
* struct stable_node - node of the stable rbtree
+ * @ronly: Page read only struct wrapper (see include/linux/page_ronly.h).
* @node: rb node of this ksm page in the stable tree
* @head: (overlaying parent) &migrate_nodes indicates temporarily on that list
* @hlist_dup: linked into the stable_node->hlist with a stable_node chain
@@ -137,6 +139,7 @@ struct ksm_scan {
* @nid: NUMA node id of stable tree in which linked (may not match kpfn)
*/
struct stable_node {
+ struct page_ronly ronly;
union {
struct rb_node node; /* when node of stable tree */
struct { /* when listed for migration */
@@ -318,13 +321,15 @@ static void __init ksm_slab_free(void)
static inline struct stable_node *page_stable_node(struct page *page)
{
- return PageReadOnly(page) ? page_rmapping(page) : NULL;
+ struct page_ronly *ronly = page_ronly(page);
+
+ return ronly ? container_of(ronly, struct stable_node, ronly) : NULL;
}
static inline void set_page_stable_node(struct page *page,
struct stable_node *stable_node)
{
- page->mapping = (void *)((unsigned long)stable_node | PAGE_MAPPING_RONLY);
+ page_ronly_set(page, stable_node ? &stable_node->ronly : NULL);
}
static __always_inline bool is_stable_node_chain(struct stable_node *chain)
--
2.14.3
