diff options
| author |   James Morris <james.l.morris@oracle.com> | 2017-12-11 17:01:08 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-12-11 17:01:08 +1100 |
| commit | d21bd6898336a7892914d308d5e0868f0b863571 (patch) | |
| tree | f5f756c25348b5a6c1ce9ddbaa7d1ecd1bef40b0 /fs/ext2/file.c | |
| parent | MAINTAINERS: update the IMA, EVM, trusted-keys, encrypted-keys entries (diff) | |
| parent | Linux 4.15-rc3 (diff) | |
| download | wireguard-linux-d21bd6898336a7892914d308d5e0868f0b863571.tar.xz wireguard-linux-d21bd6898336a7892914d308d5e0868f0b863571.zip | |
Sync to v4.15-rc3 for security subsystem developers to work against.
Diffstat (limited to 'fs/ext2/file.c')
| -rw-r--r-- | fs/ext2/file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext2/file.c b/fs/ext2/file.c index ff3a3636a5ca..2da67699dc33 100644 --- a/fs/ext2/file.c +++ b/fs/ext2/file.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/fs/ext2/file.c * @@ -99,7 +100,7 @@ static int ext2_dax_fault(struct vm_fault *vmf) } down_read(&ei->dax_sem); - ret = dax_iomap_fault(vmf, PE_SIZE_PTE, &ext2_iomap_ops); + ret = dax_iomap_fault(vmf, PE_SIZE_PTE, NULL, &ext2_iomap_ops); up_read(&ei->dax_sem); if (vmf->flags & FAULT_FLAG_WRITE) |