projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
[deliverable/linux.git]
/
mm
/
mmap.c
diff --git
a/mm/mmap.c
b/mm/mmap.c
index a65efd4db3e1e9e8228d7f33d787f431edff9df2..3c0061f744f50cad8fd79eab118d7a54561fa654 100644
(file)
--- a/
mm/mmap.c
+++ b/
mm/mmap.c
@@
-2558,7
+2558,6
@@
int mm_take_all_locks(struct mm_struct *mm)
{
struct vm_area_struct *vma;
struct anon_vma_chain *avc;
{
struct vm_area_struct *vma;
struct anon_vma_chain *avc;
- int ret = -EINTR;
BUG_ON(down_read_trylock(&mm->mmap_sem));
BUG_ON(down_read_trylock(&mm->mmap_sem));
@@
-2579,13
+2578,11
@@
int mm_take_all_locks(struct mm_struct *mm)
vm_lock_anon_vma(mm, avc->anon_vma);
}
vm_lock_anon_vma(mm, avc->anon_vma);
}
- ret
=
0;
+ ret
urn
0;
out_unlock:
out_unlock:
- if (ret)
- mm_drop_all_locks(mm);
-
- return ret;
+ mm_drop_all_locks(mm);
+ return -EINTR;
}
static void vm_unlock_anon_vma(struct anon_vma *anon_vma)
}
static void vm_unlock_anon_vma(struct anon_vma *anon_vma)
This page took
0.024923 seconds
and
5
git commands to generate.