1 files changed, 4 insertions, 6 deletions

diff --git a/mm/workingset.c b/mm/workingset.c
index 69551cfae97b..617475f529f4 100644
--- a/mm/workingset.c
+++ b/mm/workingset.c
@@ -418,21 +418,19 @@ static enum lru_status shadow_lru_isolate(struct list_head *item,
          * no pages, so we expect to be able to remove them all and
          * delete and free the empty node afterwards.
          */
-
-        BUG_ON(!node->count);
-        BUG_ON(node->count & RADIX_TREE_COUNT_MASK);
+        BUG_ON(!workingset_node_shadows(node));
+        BUG_ON(workingset_node_pages(node));
 
         for (i = 0; i < RADIX_TREE_MAP_SIZE; i++) {
                 if (node->slots[i]) {
                         BUG_ON(!radix_tree_exceptional_entry(node->slots[i]));
                         node->slots[i] = NULL;
-                        BUG_ON(node->count < (1U << RADIX_TREE_COUNT_SHIFT));
-                        node->count -= 1U << RADIX_TREE_COUNT_SHIFT;
+                        workingset_node_shadows_dec(node);
                         BUG_ON(!mapping->nrexceptional);
                         mapping->nrexceptional--;
                 }
         }
-        BUG_ON(node->count);
+        BUG_ON(workingset_node_shadows(node));
         inc_node_state(page_pgdat(virt_to_page(node)), WORKINGSET_NODERECLAIM);
         if (!__radix_tree_delete_node(&mapping->page_tree, node))
                 BUG();