diff --git a/[refs] b/[refs]
index 162fc1a6bf92..5f518314fb0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09f363c7363eb10cfb4b82094bd7064e5608258b
+refs/heads/master: 584cff54e1ff8f59d5109dc8093efedff8bcc375
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
index a65efd4db3e1..3c0061f744f5 100644
--- a/trunk/mm/mmap.c
+++ b/trunk/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)