diff options
Diffstat (limited to 'mm/filemap.c')
-rw-r--r-- | mm/filemap.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 65b4b6e7f7bd..dad935769055 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -130,17 +130,8 @@ static int page_cache_tree_insert(struct address_space *mapping, | |||
130 | return -EEXIST; | 130 | return -EEXIST; |
131 | 131 | ||
132 | mapping->nrexceptional--; | 132 | mapping->nrexceptional--; |
133 | if (!dax_mapping(mapping)) { | 133 | if (shadowp) |
134 | if (shadowp) | 134 | *shadowp = p; |
135 | *shadowp = p; | ||
136 | } else { | ||
137 | /* DAX can replace empty locked entry with a hole */ | ||
138 | WARN_ON_ONCE(p != | ||
139 | dax_radix_locked_entry(0, RADIX_DAX_EMPTY)); | ||
140 | /* Wakeup waiters for exceptional entry lock */ | ||
141 | dax_wake_mapping_entry_waiter(mapping, page->index, p, | ||
142 | true); | ||
143 | } | ||
144 | } | 135 | } |
145 | __radix_tree_replace(&mapping->page_tree, node, slot, page, | 136 | __radix_tree_replace(&mapping->page_tree, node, slot, page, |
146 | workingset_update_node, mapping); | 137 | workingset_update_node, mapping); |