---

yaml --- r: 299640 b: refs/heads/master c: ca138f3 h: refs/heads/master v: v3
git-mirror · Apr 18, 2012 · 1a158d8 · 1a158d8
1 parent 5010f3d
commit 1a158d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: adae0fe0ea87e8fb1a72dde304937c60759b495f
+refs/heads/master: ca138f368a36dba40d3ef4a53d64af2011cda3c7
diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c
@@ -682,7 +682,8 @@ static struct nfs_page *nfs_try_to_update_request(struct inode *inode,
 		req->wb_bytes = rqend - req->wb_offset;
 out_unlock:
 	spin_unlock(&inode->i_lock);
-	nfs_clear_request_commit(req);
+	if (req)
+		nfs_clear_request_commit(req);
 	return req;
 out_flushme:
 	spin_unlock(&inode->i_lock);