From 88e91bad1bef9313497f5f1beed8fc2eea288d6c Mon Sep 17 00:00:00 2001 From: Roland Fehrenbacher Date: Tue, 28 Jul 2015 12:50:04 +0200 Subject: [PATCH] LU-6922: Add assertions to prevent Oops --- lustre/fld/fld_handler.c | 3 +++ lustre/lod/lod_dev.c | 1 + 2 files changed, 4 insertions(+) diff --git a/lustre/fld/fld_handler.c b/lustre/fld/fld_handler.c index eae79ea..6528766 100644 --- a/lustre/fld/fld_handler.c +++ b/lustre/fld/fld_handler.c @@ -211,12 +211,15 @@ int fld_local_lookup(const struct lu_env *env, struct lu_server_fld *fld, int rc; ENTRY; + LASSERT(env != NULL); info = lu_context_key_get(&env->le_ctx, &fld_thread_key); LASSERT(info != NULL); erange = &info->fti_lrange; /* Lookup it in the cache. */ + LASSERT(fld != NULL); rc = fld_cache_lookup(fld->lsf_cache, seq, erange); + LASSERT(range != NULL); if (rc == 0) { if (unlikely(fld_range_type(erange) != fld_range_type(range) && !fld_range_is_any(range))) { diff --git a/lustre/lod/lod_dev.c b/lustre/lod/lod_dev.c index 9ab7972..41727d9 100644 --- a/lustre/lod/lod_dev.c +++ b/lustre/lod/lod_dev.c @@ -81,6 +81,7 @@ int lod_fld_lookup(const struct lu_env *env, struct lod_device *lod, } server_fld = lu_site2seq(lod2lu_dev(lod)->ld_site)->ss_server_fld; + LASSERT(server_fld != NULL); fld_range_set_type(&range, *type); rc = fld_server_lookup(env, server_fld, fid_seq(fid), &range); if (rc) -- 1.9.1