LU-3810 obd: Cleanup client import if client_obd_setup fails

[fs/lustre-release.git] / lustre / osp / osp_dev.c

diff --git a/lustre/osp/osp_dev.c b/lustre/osp/osp_dev.c
index aaf5073..1094a65 100644 (file)
--- a/lustre/osp/osp_dev.c
+++ b/lustre/osp/osp_dev.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,9 +42,6 @@
  * Author: Di Wang <di.wang@intel.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_MDS
 
 #include <obd_class.h>
@@ -55,7 +52,7 @@
 #include "osp_internal.h"
 
 /* Slab for OSP object allocation */
-cfs_mem_cache_t *osp_object_kmem;
+struct kmem_cache *osp_object_kmem;
 
 static struct lu_kmem_descr osp_caches[] = {
        {
@@ -76,7 +73,7 @@ struct lu_object *osp_object_alloc(const struct lu_env *env,
        struct osp_object       *o;
        struct lu_object        *l;
 
-       OBD_SLAB_ALLOC_PTR_GFP(o, osp_object_kmem, CFS_ALLOC_IO);
+       OBD_SLAB_ALLOC_PTR_GFP(o, osp_object_kmem, __GFP_IO);
        if (o != NULL) {
                l = &o->opo_obj.do_lu;
 
@@ -351,9 +348,6 @@ static int osp_shutdown(const struct lu_env *env, struct osp_device *d)
        ENTRY;
 
        LASSERT(env);
-       /* release last_used file */
-       if (!d->opd_connect_mdt)
-               osp_last_used_fini(env, d);
 
        rc = osp_disconnect(d);
 
@@ -363,6 +357,9 @@ static int osp_shutdown(const struct lu_env *env, struct osp_device *d)
 
                /* stop sync thread */
                osp_sync_fini(d);
+
+               /* release last_used file */
+               osp_last_used_fini(env, d);
        }
 
        obd_fid_fini(d->opd_obd);
@@ -380,6 +377,9 @@ static int osp_process_config(const struct lu_env *env,
        ENTRY;
 
        switch (lcfg->lcfg_command) {
+       case LCFG_PRE_CLEANUP:
+               rc = osp_disconnect(d);
+               break;
        case LCFG_CLEANUP:
                lu_dev_del_linkage(dev->ld_site, dev);
                rc = osp_shutdown(env, d);
@@ -422,7 +422,7 @@ static int osp_recovery_complete(const struct lu_env *env,
        ENTRY;
        osp->opd_recovery_completed = 1;
        if (!osp->opd_connect_mdt)
-               cfs_waitq_signal(&osp->opd_pre_waitq);
+               wake_up(&osp->opd_pre_waitq);
        RETURN(rc);
 }
 
@@ -539,7 +539,8 @@ static int osp_init0(const struct lu_env *env, struct osp_device *m,
        struct obd_import       *imp;
        class_uuid_t            uuid;
        char                    *src, *tgt, *mdt, *osdname = NULL;
-       int                     rc, idx;
+       int                     rc;
+       long                    idx;
 
        ENTRY;
 
@@ -595,18 +596,29 @@ static int osp_init0(const struct lu_env *env, struct osp_device *m,
                        RETURN(-EINVAL);
                }
                m->opd_index = idx;
+               m->opd_group = 0;
                idx = tgt - src;
        } else {
                /* New OSC name fsname-OSTXXXX-osc-MDTXXXX */
                if (strncmp(tgt, "-MDT", 4) != 0 &&
-                        strncmp(tgt, "-OST", 4) != 0) {
+                   strncmp(tgt, "-OST", 4) != 0) {
                        CERROR("%s: invalid target name %s\n",
                               m->opd_obd->obd_name, lustre_cfg_string(cfg, 0));
                        RETURN(-EINVAL);
                }
 
+               idx = simple_strtol(tgt + 4, &mdt, 16);
+               if (*mdt != '\0' || idx > INT_MAX || idx < 0) {
+                       CERROR("%s: invalid OST index in '%s'\n",
+                              m->opd_obd->obd_name, src);
+                       RETURN(-EINVAL);
+               }
+
+               /* Get MDT index from the name and set it to opd_group,
+                * which will be used by OSP to connect with OST */
+               m->opd_group = idx;
                if (tgt - src <= 12) {
-                       CERROR("%s: invalid target name %s\n",
+                       CERROR("%s: invalid mdt index retrieve from %s\n",
                               m->opd_obd->obd_name, lustre_cfg_string(cfg, 0));
                        RETURN(-EINVAL);
                }
@@ -651,7 +663,7 @@ static int osp_init0(const struct lu_env *env, struct osp_device *m,
 
                OBD_ALLOC(cli->cl_rpc_lock, sizeof(*cli->cl_rpc_lock));
                if (!cli->cl_rpc_lock)
-                       RETURN(-ENOMEM);
+                       GOTO(out_fini, rc = -ENOMEM);
                osp_init_rpc_lock(cli->cl_rpc_lock);
        }
 
@@ -681,6 +693,14 @@ static int osp_init0(const struct lu_env *env, struct osp_device *m,
                rc = osp_last_used_init(env, m);
                if (rc)
                        GOTO(out_proc, rc);
+
+               rc = obd_fid_init(m->opd_obd, NULL, LUSTRE_SEQ_DATA);
+               if (rc) {
+                       CERROR("%s: fid init error: rc = %d\n",
+                              m->opd_obd->obd_name, rc);
+                       GOTO(out_last_used, rc);
+               }
+
                /* Initialize precreation thread, it handles new
                 * connections as well. */
                rc = osp_init_precreate(m);
@@ -695,12 +715,6 @@ static int osp_init0(const struct lu_env *env, struct osp_device *m,
                if (rc)
                        GOTO(out_precreat, rc);
 
-               rc = obd_fid_init(m->opd_obd, NULL, LUSTRE_SEQ_DATA);
-               if (rc) {
-                       CERROR("%s: fid init error: rc = %d\n",
-                              m->opd_obd->obd_name, rc);
-                       GOTO(out, rc);
-               }
        }
        /*
         * Initiate connect to OST
@@ -726,11 +740,13 @@ out_precreat:
        if (!m->opd_connect_mdt)
                osp_precreate_fini(m);
 out_last_used:
-       osp_last_used_fini(env, m);
+       if (!m->opd_connect_mdt)
+               osp_last_used_fini(env, m);
 out_proc:
        ptlrpc_lprocfs_unregister_obd(obd);
        lprocfs_obd_cleanup(obd);
-       class_destroy_import(obd->u.cli.cl_import);
+       if (m->opd_symlink)
+               lprocfs_remove(&m->opd_symlink);
        client_obd_cleanup(obd);
 out_ref:
        ptlrpcd_decref();
@@ -808,8 +824,6 @@ static struct lu_device *osp_device_fini(const struct lu_env *env,
                imp->imp_rq_pool = NULL;
        }
 
-       obd_cleanup_client_import(m->opd_obd);
-
        if (m->opd_symlink)
                lprocfs_remove(&m->opd_symlink);
 
@@ -1010,7 +1024,7 @@ static int osp_import_event(struct obd_device *obd, struct obd_import *imp,
                if (d->opd_connect_mdt)
                        break;
                osp_pre_update_status(d, -ENODEV);
-               cfs_waitq_signal(&d->opd_pre_waitq);
+               wake_up(&d->opd_pre_waitq);
                CDEBUG(D_HA, "got disconnected\n");
                break;
        case IMP_EVENT_INACTIVE:
@@ -1018,7 +1032,7 @@ static int osp_import_event(struct obd_device *obd, struct obd_import *imp,
                if (d->opd_connect_mdt)
                        break;
                osp_pre_update_status(d, -ENODEV);
-               cfs_waitq_signal(&d->opd_pre_waitq);
+               wake_up(&d->opd_pre_waitq);
                CDEBUG(D_HA, "got inactive\n");
                break;
        case IMP_EVENT_ACTIVE:
@@ -1029,7 +1043,7 @@ static int osp_import_event(struct obd_device *obd, struct obd_import *imp,
                d->opd_imp_seen_connected = 1;
                if (d->opd_connect_mdt)
                        break;
-               cfs_waitq_signal(&d->opd_pre_waitq);
+               wake_up(&d->opd_pre_waitq);
                __osp_sync_check_for_work(d);
                CDEBUG(D_HA, "got connected\n");
                break;
@@ -1063,7 +1077,7 @@ static int osp_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
        d = lu2osp_dev(obd->obd_lu_dev);
        LASSERT(d->opd_dt_dev.dd_ops == &osp_dt_ops);
 
-       if (!cfs_try_module_get(THIS_MODULE)) {
+       if (!try_module_get(THIS_MODULE)) {
                CERROR("%s: can't get module. Is it alive?", obd->obd_name);
                return -EINVAL;
        }
@@ -1084,10 +1098,10 @@ static int osp_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                break;
        default:
                CERROR("%s: unrecognized ioctl %#x by %s\n", obd->obd_name,
-                      cmd, cfs_curproc_comm());
+                      cmd, current_comm());
                rc = -ENOTTY;
        }
-       cfs_module_put(THIS_MODULE);
+       module_put(THIS_MODULE);
        return rc;
 }