There is otherwise a risk of a possible null pointer dereference.

Was largely found by using a static code analysis program called cppcheck.

Signed-off-by: Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se>
---
 drivers/staging/lustre/lustre/lov/lov_obd.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/lustre/lustre/lov/lov_obd.c 
b/drivers/staging/lustre/lustre/lov/lov_obd.c
index 02509d0..0364c16 100644
--- a/drivers/staging/lustre/lustre/lov/lov_obd.c
+++ b/drivers/staging/lustre/lustre/lov/lov_obd.c
@@ -280,7 +280,7 @@ static int lov_disconnect_obd(struct obd_device *obd, 
struct lov_tgt_desc *tgt)
 
        osc_obd = class_exp2obd(tgt->ltd_exp);
        CDEBUG(D_CONFIG, "%s: disconnecting target %s\n",
-              obd->obd_name, osc_obd->obd_name);
+               obd->obd_name, osc_obd ? osc_obd->obd_name : "NULL");
 
        if (tgt->ltd_active) {
                tgt->ltd_active = 0;
@@ -288,11 +288,11 @@ static int lov_disconnect_obd(struct obd_device *obd, 
struct lov_tgt_desc *tgt)
                tgt->ltd_exp->exp_obd->obd_inactive = 1;
        }
 
-       lov_proc_dir = obd->obd_proc_private;
-       if (lov_proc_dir)
-               lprocfs_remove_proc_entry(osc_obd->obd_name, lov_proc_dir);
-
        if (osc_obd) {
+               lov_proc_dir = obd->obd_proc_private;
+               if (lov_proc_dir) {
+                       lprocfs_remove_proc_entry(osc_obd->obd_name, 
lov_proc_dir);
+               }
                /* Pass it on to our clients.
                 * XXX This should be an argument to disconnect,
                 * XXX not a back-door flag on the OBD.  Ah well.
-- 
1.7.10.4

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to