1 files changed, 3 insertions, 6 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index a65efd4db3e1..3c0061f744f5 100644
--- 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;
-        int ret = -EINTR;
 
         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);
         }
 
-        ret = 0;
+        return 0;
 
 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)