summaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorFred Isaman <fred.isaman@gmail.com>2017-05-02 16:53:36 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2017-05-03 12:29:41 -0400
commitc296cfe26bdd86de6eeefde57d333174ed9574d0 (patch)
treeedbbecf81d17be103e2c40066b41d2bb64f1641f /fs/nfs
parent5f0114832a6eca70ee7563ba99b8e32da68f944b (diff)
pNFS: Fix NULL dereference in pnfs_generic_alloc_ds_commits
Signed-off-by: Fred Isaman <fred.isaman@gmail.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/pnfs_nfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c
index ae600ab1a646..d40755a0984b 100644
--- a/fs/nfs/pnfs_nfs.c
+++ b/fs/nfs/pnfs_nfs.c
@@ -221,7 +221,7 @@ pnfs_generic_alloc_ds_commits(struct nfs_commit_info *cinfo,
* If the layout segment is invalid, then let
* pnfs_generic_retry_commit() clean up the bucket.
*/
- if (!pnfs_is_valid_lseg(bucket->clseg) &&
+ if (bucket->clseg && !pnfs_is_valid_lseg(bucket->clseg) &&
!test_bit(NFS_LSEG_LAYOUTRETURN, &bucket->clseg->pls_flags))
break;
data = nfs_commitdata_alloc(false);