diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-16 15:05:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-16 15:05:45 +0100 |
| commit | 5593edfbfa30a049fca9abbd70a834d2888a4d9d (patch) | |
| tree | a5c67524a82995fa17e44669c037fcced4fa91aa /mm/filemap.c | |
| parent | 113ccc38378b6f0b24c0993040c6044e35163a51 (diff) | |
| parent | 49def1853334396f948dcb4cedb9347abb318df5 (diff) | |
| download | talos-op-linux-5593edfbfa30a049fca9abbd70a834d2888a4d9d.tar.gz talos-op-linux-5593edfbfa30a049fca9abbd70a834d2888a4d9d.zip | |
Merge 4.10-rc4 into driver-core-next
We want the sysfs file revert and other fixes in here as well for
testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index d0e4d1002059..b772a33ef640 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -138,7 +138,7 @@ static int page_cache_tree_insert(struct address_space *mapping, dax_radix_locked_entry(0, RADIX_DAX_EMPTY)); /* Wakeup waiters for exceptional entry lock */ dax_wake_mapping_entry_waiter(mapping, page->index, p, - false); + true); } } __radix_tree_replace(&mapping->page_tree, node, slot, page, |
