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);