From 3c3387ecc8b223418824ac6f0d962341e2379bfc Mon Sep 17 00:00:00 2001 From: Kautuk Consul Date: Mon, 31 Oct 2011 17:08:59 -0700 Subject: [PATCH] --- yaml --- r: 272151 b: refs/heads/master c: 584cff54e1ff8f59d5109dc8093efedff8bcc375 h: refs/heads/master i: 272149: 52c39b914dc3292c2de5005d0eeb9451aa6f828c 272147: 11d7748bce4b51832e9d4fc964b015afcfa526e6 272143: 220d4d6f63177feaf70009dc02bfc0c872fa9a2a v: v3 --- [refs] | 2 +- trunk/mm/mmap.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) 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)