Wrapfs: remove unnecessary call to vm_unmap in ->mmap

Code is unnecessary and causes deadlocks in newer kernels.

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/wrapfs/file.c b/fs/wrapfs/file.c
index 51378a8478f3037dfc533a8d2c63b680e4e2b273..8420e94275b977bd3b00c15a1ddd8b6e400a164c 100644 (file)
--- a/fs/wrapfs/file.c
+++ b/fs/wrapfs/file.c
@@ -141,12 +141,6 @@ static int wrapfs_mmap(struct file *file, struct vm_area_struct *vma)
                        goto out;
                }
                saved_vm_ops = vma->vm_ops; /* save: came from lower ->mmap */
-               err = do_munmap(current->mm, vma->vm_start,
-                               vma->vm_end - vma->vm_start);
-               if (err) {
-                       printk(KERN_ERR "wrapfs: do_munmap failed %d\n", err);
-                       goto out;
-               }
        }
 
        /*