]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
staging: lustre: fix framework.c issues found by Klocwork Insight tool
authorDmitry Eremin <dmitry.eremin@intel.com>
Wed, 2 Mar 2016 22:01:58 +0000 (17:01 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 Mar 2016 23:23:49 +0000 (15:23 -0800)
The functions sfw_test_buffers() and sfw_unload_test() from LNet
selftest both assume sfw_test_instance_t being passed in is never
null. This is corrected here.

Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4629
Reviewed-on: http://review.whamcloud.com/9386
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Isaac Huang <he.huang@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lnet/selftest/framework.c

index 3bbc720842ab6420196ba02d6b099cf557efe1a9..e4a9724db68a5d536d6a1f46bf2190c648665e44 100644 (file)
@@ -541,10 +541,16 @@ sfw_test_rpc_fini(srpc_client_rpc_t *rpc)
 static inline int
 sfw_test_buffers(sfw_test_instance_t *tsi)
 {
-       struct sfw_test_case *tsc = sfw_find_test_case(tsi->tsi_service);
-       struct srpc_service *svc = tsc->tsc_srv_service;
+       struct sfw_test_case *tsc;
+       struct srpc_service *svc;
        int nbuf;
 
+       LASSERT(tsi);
+       tsc = sfw_find_test_case(tsi->tsi_service);
+       LASSERT(tsc);
+       svc = tsc->tsc_srv_service;
+       LASSERT(svc);
+
        nbuf = min(svc->sv_wi_total, tsi->tsi_loop) / svc->sv_ncpts;
        return max(SFW_TEST_WI_MIN, nbuf + SFW_TEST_WI_EXTRA);
 }
@@ -591,8 +597,10 @@ sfw_load_test(struct sfw_test_instance *tsi)
 static void
 sfw_unload_test(struct sfw_test_instance *tsi)
 {
-       struct sfw_test_case *tsc = sfw_find_test_case(tsi->tsi_service);
+       struct sfw_test_case *tsc;
 
+       LASSERT(tsi);
+       tsc = sfw_find_test_case(tsi->tsi_service);
        LASSERT(tsc);
 
        if (tsi->tsi_is_client)