---

yaml --- r: 130383 b: refs/heads/master c: 85d9fc8 h: refs/heads/master i: 130381: 61288ea 130379: f558685 130375: 9e041a2 130367: 24560e5 v: v3
git-mirror · Jan 30, 2009 · 816abfa · 816abfa
1 parent 1db0d90
commit 816abfa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7460db567bbca76bf087d1694d792a1a96bdaa26
+refs/heads/master: 85d9fc89fb0f0703df6444f260187c088a8d59ff
diff --git a/trunk/mm/swapfile.c b/trunk/mm/swapfile.c
@@ -698,8 +698,10 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd,
 	pte_t *pte;
 	int ret = 1;
 
-	if (mem_cgroup_try_charge_swapin(vma->vm_mm, page, GFP_KERNEL, &ptr))
+	if (mem_cgroup_try_charge_swapin(vma->vm_mm, page, GFP_KERNEL, &ptr)) {
 		ret = -ENOMEM;
+		goto out_nolock;
+	}
 
 	pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);
 	if (unlikely(!pte_same(*pte, swp_entry_to_pte(entry)))) {
@@ -723,6 +725,7 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd,
 	activate_page(page);
 out:
 	pte_unmap_unlock(pte, ptl);
+out_nolock:
 	return ret;
 }