diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2016-11-13 22:02:15 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2016-11-13 22:02:15 -0500 |
| commit | a2f6d9c4c081ec2a02529b8af2c04f3e557a3a3e (patch) | |
| tree | 643b4ba9e9f628a717d2d9741f0286842dcac28c /mm | |
| parent | bc33b0ca11e3df467777a4fa7639ba488c9d4911 (diff) | |
| parent | 9484ab1bf4464faae695321dd4fa66365beda74e (diff) | |
| download | op-kernel-dev-a2f6d9c4c081ec2a02529b8af2c04f3e557a3a3e.zip op-kernel-dev-a2f6d9c4c081ec2a02529b8af2c04f3e557a3a3e.tar.gz | |
Merge branch 'dax-4.10-iomap-pmd' into origin
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/filemap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index c7fe2f1..db26ebc 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -137,13 +137,12 @@ static int page_cache_tree_insert(struct address_space *mapping, } else { /* DAX can replace empty locked entry with a hole */ WARN_ON_ONCE(p != - (void *)(RADIX_TREE_EXCEPTIONAL_ENTRY | - RADIX_DAX_ENTRY_LOCK)); + dax_radix_locked_entry(0, RADIX_DAX_EMPTY)); /* DAX accounts exceptional entries as normal pages */ if (node) workingset_node_pages_dec(node); /* Wakeup waiters for exceptional entry lock */ - dax_wake_mapping_entry_waiter(mapping, page->index, + dax_wake_mapping_entry_waiter(mapping, page->index, p, false); } } |
