---

yaml --- r: 47400 b: refs/heads/master c: c3704ce h: refs/heads/master v: v3
git-mirror · Feb 11, 2007 · b5acc07 · b5acc07
1 parent 4cbd088
commit b5acc07
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f05b6284ee5d3be51ebe22284fc4b25fc586f380
+refs/heads/master: c3704ceb4ad055b489b143f4e37c57d128908012
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
@@ -1531,8 +1531,6 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
 			if (vma->vm_ops->page_mkwrite(vma, old_page) < 0)
 				goto unwritable_page;
 
-			page_cache_release(old_page);
-
 			/*
 			 * Since we dropped the lock we need to revalidate
 			 * the PTE as someone else may have changed it.  If
@@ -1541,6 +1539,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
 			 */
 			page_table = pte_offset_map_lock(mm, pmd, address,
 							 &ptl);
+			page_cache_release(old_page);
 			if (!pte_same(*page_table, orig_pte))
 				goto unlock;
 		}