LU-1804 tests: skip OI scrub speed test under UP env

[fs/lustre-release.git] / lustre / ofd / ofd_dev.c

diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c
index 9297ec3..ac87ce5 100644 (file)
--- a/lustre/ofd/ofd_dev.c
+++ b/lustre/ofd/ofd_dev.c
@@ -70,33 +70,35 @@ static int ofd_stack_init(const struct lu_env *env,
        struct lu_device_type   *ldt;
        struct lu_device        *d;
        struct ofd_thread_info  *info = ofd_info(env);
+       struct lustre_mount_info *lmi;
        int                      rc;
 
        ENTRY;
 
-       /* XXX: we should be able to use different OSDs here */
-       type = class_get_type(LUSTRE_OSD_NAME);
-       if (!type) {
-               CERROR("Unknown type: '%s'\n", LUSTRE_OSD_NAME);
+       lmi = server_get_mount_2(dev);
+       if (lmi == NULL) {
+               CERROR("Cannot get mount info for %s!\n", dev);
                RETURN(-ENODEV);
        }
 
-       rc = lu_env_refill((struct lu_env *)env);
-       if (rc != 0) {
-               CERROR("Failure to refill session: '%d'\n", rc);
-               GOTO(out_type, rc);
+       type = class_get_type(s2lsi(lmi->lmi_sb)->lsi_osd_type);
+       if (!type) {
+               CERROR("Unknown type: '%s'\n",
+                      s2lsi(lmi->lmi_sb)->lsi_osd_type);
+               RETURN(-ENODEV);
        }
 
        ldt = type->typ_lu;
        if (ldt == NULL) {
-               CERROR("type: '%s'\n", LUSTRE_OSD_NAME);
+               CERROR("type: '%s'\n", s2lsi(lmi->lmi_sb)->lsi_osd_type);
                GOTO(out_type, rc = -EINVAL);
        }
 
        ldt->ldt_obd_type = type;
        d = ldt->ldt_ops->ldto_device_alloc(env, ldt, cfg);
        if (IS_ERR(d)) {
-               CERROR("Cannot allocate device: '%s'\n", LUSTRE_OSD_NAME);
+               CERROR("Cannot allocate device: '%s'\n",
+                      s2lsi(lmi->lmi_sb)->lsi_osd_type);
                GOTO(out_type, rc = -ENODEV);
        }
 
@@ -107,9 +109,17 @@ static int ofd_stack_init(const struct lu_env *env,
                 "%s-osd", lustre_cfg_string(cfg, 0));
 
        type->typ_refcnt++;
+
+       rc = lu_env_refill((struct lu_env *)env);
+       if (rc != 0) {
+               CERROR("Failure to refill session: '%d'\n", rc);
+               GOTO(out_free, rc);
+       }
+
        rc = ldt->ldt_ops->ldto_device_init(env, d, dev, NULL);
        if (rc) {
-               CERROR("can't init device '%s', rc %d\n", LUSTRE_OSD_NAME, rc);
+               CERROR("can't init device '%s', rc = %d\n",
+                      s2lsi(lmi->lmi_sb)->lsi_osd_type, rc);
                GOTO(out_free, rc);
        }
        lu_device_get(d);