---

yaml
---
r: 190199
b: refs/heads/master
c: 31f2b0e
h: refs/heads/master
i:
  190197: ddf7e58
  190195: ce66d2d
  190191: a18ae87
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93b4a44f3ad69520d605aace3f3486b8eb754b96
+refs/heads/master: 31f2b0ebc01fd332cb0997f7ce9f9cde29af9e20

trunk/mm/rmap.c

@@ -133,8 +133,8 @@ int anon_vma_prepare(struct vm_area_struct *vma)
 				goto out_enomem_free_avc;
 			allocated = anon_vma;
 		}
-		spin_lock(&anon_vma->lock);
 
+		spin_lock(&anon_vma->lock);
 		/* page_table_lock to protect against threads */
 		spin_lock(&mm->page_table_lock);
 		if (likely(!vma->anon_vma)) {
@@ -144,14 +144,15 @@ int anon_vma_prepare(struct vm_area_struct *vma)
 			list_add(&avc->same_vma, &vma->anon_vma_chain);
 			list_add(&avc->same_anon_vma, &anon_vma->head);
 			allocated = NULL;
+			avc = NULL;
 		}
 		spin_unlock(&mm->page_table_lock);
-
 		spin_unlock(&anon_vma->lock);
-		if (unlikely(allocated)) {
+
+		if (unlikely(allocated))
 			anon_vma_free(allocated);
+		if (unlikely(avc))
 			anon_vma_chain_free(avc);
-		}
 	}
 	return 0;