summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorFred Isaman <iisaman@netapp.com>2012-04-05 15:26:36 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-04-18 11:05:49 -0400
commitca138f368a36dba40d3ef4a53d64af2011cda3c7 (patch)
tree542ffcce3992273475946a3c5a60155630320ca6 /fs
parentadae0fe0ea87e8fb1a72dde304937c60759b495f (diff)
downloadop-kernel-dev-ca138f368a36dba40d3ef4a53d64af2011cda3c7.zip
op-kernel-dev-ca138f368a36dba40d3ef4a53d64af2011cda3c7.tar.gz
NFS: check for req==NULL in nfs_try_to_update_request cleanup
Signed-off-by: Fred Isaman <iisaman@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/write.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 2c68818..9b8d4d4 100644
--- a/fs/nfs/write.c
+++ b/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);
OpenPOWER on IntegriCloud