diff options
| author | Daniel Rosenberg <drosen@google.com> | 2017-03-09 21:14:45 -0800 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-13 12:35:24 +0200 |
| commit | fe94dbb9088d5b743ccac7a1c466c75fa850d03b (patch) | |
| tree | d4f987b8b3d53456b10b5acb3c9c3aac2b2ec57f | |
| parent | 4d06d0fd70628e496a29a5be287a6ffaafe9f039 (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
| -rwxr-xr-x | 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 f31e5cc86..d193d64e3 100755 --- 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; - } } /* |