diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 15:04:56 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 15:04:56 +1100 |
| commit | 200445685b48a1f4eb8e4abb4ae46f22236b1197 (patch) | |
| tree | df539695199b303a7a0cd975c951bcb3987b59f8 /mm | |
| parent | 347739198a12693d0b7880fcd1a009a75f62b945 (diff) | |
| parent | 768dd325a38200abb3725bbd490773ce65954752 (diff) | |
Merge remote-tracking branch 'idr/idr-4.11'
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/workingset.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/workingset.c b/mm/workingset.c index abb58ffa3c64..80c913c89f11 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -354,10 +354,8 @@ void workingset_update_node(struct radix_tree_node *node, void *private) * as node->private_list is protected by &mapping->tree_lock. */ if (node->count && node->count == node->exceptional) { - if (list_empty(&node->private_list)) { - node->private_data = mapping; + if (list_empty(&node->private_list)) list_lru_add(&shadow_nodes, &node->private_list); - } } else { if (!list_empty(&node->private_list)) list_lru_del(&shadow_nodes, &node->private_list); @@ -435,7 +433,7 @@ static enum lru_status shadow_lru_isolate(struct list_head *item, */ node = container_of(item, struct radix_tree_node, private_list); - mapping = node->private_data; + mapping = container_of(node->root, struct address_space, page_tree); /* Coming from the list, invert the lock order */ if (!spin_trylock(&mapping->tree_lock)) { |