---

yaml --- r: 101894 b: refs/heads/master c: f3d47a3 h: refs/heads/master v: v3
git-mirror · Jul 9, 2008 · d1b06c1 · d1b06c1
1 parent e8a2572
commit d1b06c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b4aae7aad162ad175ba8a65708332f888066b26
+refs/heads/master: f3d47a3a6a1484a93c8cfe1e8c8d4399c95199c7
diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c
@@ -584,13 +584,6 @@ static struct nfs_page * nfs_update_request(struct nfs_open_context* ctx,
 		/* Loop over all inode entries and see if we find
 		 * A request for the page we wish to update
 		 */
-		if (new) {
-			if (radix_tree_preload(GFP_NOFS)) {
-				nfs_release_request(new);
-				return ERR_PTR(-ENOMEM);
-			}
-		}
-
 		spin_lock(&inode->i_lock);
 		req = nfs_page_find_request_locked(page);
 		if (req) {
@@ -630,6 +623,10 @@ static struct nfs_page * nfs_update_request(struct nfs_open_context* ctx,
 		new = nfs_create_request(ctx, inode, page, offset, bytes);
 		if (IS_ERR(new))
 			return new;
+		if (radix_tree_preload(GFP_NOFS)) {
+			nfs_release_request(new);
+			return ERR_PTR(-ENOMEM);
+		}
 	}
 
 	/* We have a request for our page.