From 1a158d82599078773f594ce607bf9545df83b96e Mon Sep 17 00:00:00 2001
From: Fred Isaman <iisaman@netapp.com>
Date: Thu, 5 Apr 2012 15:26:36 -0400
Subject: [PATCH] --- yaml --- r: 299640 b: refs/heads/master c:
 ca138f368a36dba40d3ef4a53d64af2011cda3c7 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/write.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4801d9aa3348..23d19b16a8b3 100644
--- 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
index 2c68818f68ac..9b8d4d42a8af 100644
--- 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);