Branch HEAD

b=19479
i=jinshan.xiong
i=tom.wang

Fix oops: make sure next is not NULL before using it.

diff --git a/lustre/obdecho/echo_client.c b/lustre/obdecho/echo_client.c
index f5b47d1..ec96354 100644 (file)
--- a/lustre/obdecho/echo_client.c
+++ b/lustre/obdecho/echo_client.c
@@ -694,7 +694,7 @@ static struct lu_device *echo_device_alloc(const struct lu_env *env,
         tgt = class_name2obd(lustre_cfg_string(cfg, 1));
         LASSERT(tgt != NULL);
         next = tgt->obd_lu_dev;
-        if (!lu_device_is_cl(next))
+        if (next != NULL && !lu_device_is_cl(next))
                 next = NULL;
 
         /*