diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-11 11:16:39 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-11 11:16:39 +0800 |
| commit | d83731cf53fd3af7173cab5e3f573d06ebc852be (patch) | |
| tree | d61002ed1d894fe2d9b26003a1230f05a61ed51b /fs/ext4/file.c | |
| parent | bfbd381ea0ca274e4c07ea62acaaeac31829cd5d (diff) | |
| parent | 017cfa86c2450b158d7d0336f2f3ea685da1230b (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-16.04-rt
Diffstat (limited to 'fs/ext4/file.c')
| -rw-r--r-- | fs/ext4/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 0613c256c344..dd65fac5ff2f 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -213,7 +213,7 @@ static const struct vm_operations_struct ext4_dax_vm_ops = { #endif static const struct vm_operations_struct ext4_file_vm_ops = { - .fault = filemap_fault, + .fault = ext4_filemap_fault, .map_pages = filemap_map_pages, .page_mkwrite = ext4_page_mkwrite, }; |