diff options
| author | Daniel Rosenberg <drosen@google.com> | 2017-03-09 21:14:45 -0800 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2017-04-10 13:29:39 +0530 |
| commit | 4e2cd7c27606e5666d679b692242132d9abdebb8 (patch) | |
| tree | bae01908f61a543d075caab1a80c22423b1f4f44 /fs/sdcardfs | |
| parent | f8dc2db873ec44ab98cf5ecdec3b16d092eea80e (diff) | |
ANDROID: sdcardfs: remove unnecessary call to do_munmap
Adapted from wrapfs
commit 5be6de9ecf02 ("Wrapfs: use vm_munmap in ->mmap")
commit 2c9f6014a8bb ("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>
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 35766959
Change-Id: Ia252d60c60799d7e28fc5f1f0f5b5ec2430a2379
Diffstat (limited to 'fs/sdcardfs')
| -rw-r--r-- | fs/sdcardfs/file.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/sdcardfs/file.c b/fs/sdcardfs/file.c index eee4eb5896e5..7e2c50b30782 100644 --- a/fs/sdcardfs/file.c +++ b/fs/sdcardfs/file.c @@ -176,12 +176,6 @@ static int sdcardfs_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) { - pr_err("sdcardfs: do_munmap failed %d\n", err); - goto out; - } } /* |