LU-9855 lustre: use with_imp_locked() more broadly.

[fs/lustre-release.git] / lustre / osc / lproc_osc.c

diff --git a/lustre/osc/lproc_osc.c b/lustre/osc/lproc_osc.c
index 3bd71dd..ab5d2c5 100644 (file)
--- a/lustre/osc/lproc_osc.c
+++ b/lustre/osc/lproc_osc.c
@@ -60,6 +60,7 @@ static ssize_t active_store(struct kobject *kobj, struct attribute *attr,
 {
        struct obd_device *obd = container_of(kobj, struct obd_device,
                                              obd_kset.kobj);
+       struct obd_import *imp, *imp0;
        bool val;
        int rc;
 
@@ -67,14 +68,19 @@ static ssize_t active_store(struct kobject *kobj, struct attribute *attr,
        if (rc)
                return rc;
 
+       with_imp_locked(obd, imp0, rc)
+               imp = class_import_get(imp0);
+       if (rc)
+               return rc;
        /* opposite senses */
-       if (obd->u.cli.cl_import->imp_deactive == val)
-               rc = ptlrpc_set_import_active(obd->u.cli.cl_import, val);
+       if (imp->imp_deactive == val)
+               rc = ptlrpc_set_import_active(imp, val);
        else
                CDEBUG(D_CONFIG, "activate %u: ignoring repeat request\n",
                       (unsigned int)val);
+       class_import_put(imp);
 
-       return count;
+       return rc ?: count;
 }
 LUSTRE_RW_ATTR(active);