2 files changed, 4 insertions, 0 deletions

diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index 1a5e8e893d75..bad0b24cb773 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -364,6 +364,8 @@ 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;
+
         gfs2_glock_dq_uninit(&i_gh);
 
         return error;
diff --git a/fs/gfs2/ops_vm.c b/fs/gfs2/ops_vm.c
index 404b7cc9f8c4..d5a98cbfebdc 100644
--- a/fs/gfs2/ops_vm.c
+++ b/fs/gfs2/ops_vm.c
@@ -138,6 +138,8 @@ static struct page *gfs2_sharewrite_nopage(struct vm_area_struct *area,
         if (alloc_required) {
                 error = alloc_page_backing(ip, result);
                 if (error) {
+                        if (area->vm_flags & VM_CAN_INVALIDATE)
+                                unlock_page(result);
                         page_cache_release(result);
                         result = NULL;
                         goto out;