mm: merge populate and nopage into fault (fixes nonlinear)

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / gfs2 / ops_file.c

diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index bad0b24cb77398aac29fd871f5bb62eda298a2f8..581ac11b2656db986a042a2293858055e5d88f3b 100644 (file)
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -364,7 +364,7 @@ static int gfs2_mmap(struct file *file, struct vm_area_struct *vma)
        else
                vma->vm_ops = &gfs2_vm_ops_private;
 
-       vma->vm_flags |= VM_CAN_INVALIDATE;
+       vma->vm_flags |= VM_CAN_INVALIDATE|VM_CAN_NONLINEAR;
 
        gfs2_glock_dq_uninit(&i_gh);