---

yaml --- r: 175997 b: refs/heads/master c: 190f38e h: refs/heads/master i: 175995: da8c4ec v: v3
git-mirror · Dec 10, 2009 · 38d7052 · 38d7052
1 parent 5fe30b3
commit 38d7052
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 053e324f67b9921fe7de0c4cbc720d29cb4bf207
+refs/heads/master: 190f38e5cedc910940b1da9015f00458c18f97b4
diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c
@@ -1611,15 +1611,16 @@ int nfs_migrate_page(struct address_space *mapping, struct page *newpage,
 	if (ret)
 		goto out_unlock;
 	page_cache_get(newpage);
+	spin_lock(&mapping->host->i_lock);
 	req->wb_page = newpage;
 	SetPagePrivate(newpage);
-	set_page_private(newpage, page_private(page));
+	set_page_private(newpage, (unsigned long)req);
 	ClearPagePrivate(page);
 	set_page_private(page, 0);
+	spin_unlock(&mapping->host->i_lock);
 	page_cache_release(page);
 out_unlock:
 	nfs_clear_page_tag_locked(req);
-	nfs_release_request(req);
 out:
 	return ret;
 }