diff options
| author |   Huang Shijie <b32955@freescale.com> | 2014-06-04 16:07:33 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 16:54:01 -0700 |
| commit | 64ac4940d557df8caab602eaea679ec7eaf9a57f (patch) | |
| tree | e4497bc71d3b43510beb12927e65adeb59391462 | |
| parent | mm/swap.c: clean up *lru_cache_add* functions (diff) | |
| download | linux-dev-64ac4940d557df8caab602eaea679ec7eaf9a57f.tar.xz linux-dev-64ac4940d557df8caab602eaea679ec7eaf9a57f.zip | |
mm/mmap.c: remove the first mapping check
Remove the first mapping check for vma_link. Move the mutex_lock into the
braces when vma->vm_file is true.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | mm/mmap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/mmap.c b/mm/mmap.c index 6cdec3a6f4bf..8a56d39df4ed 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -640,11 +640,10 @@ static void vma_link(struct mm_struct *mm, struct vm_area_struct *vma, { struct address_space *mapping = NULL; - if (vma->vm_file) + if (vma->vm_file) { mapping = vma->vm_file->f_mapping; - - if (mapping) mutex_lock(&mapping->i_mmap_mutex); + } __vma_link(mm, vma, prev, rb_link, rb_parent); __vma_link_file(vma); |