LU-4076 fld: add local fldb to each target

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

diff --git a/lustre/osp/osp_dev.c b/lustre/osp/osp_dev.c
index cc4a1ae..0a4938c 100644 (file)
--- a/lustre/osp/osp_dev.c
+++ b/lustre/osp/osp_dev.c
@@ -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;
 
@@ -425,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);
 }
 
@@ -542,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;
 
@@ -603,7 +601,7 @@ static int osp_init0(const struct lu_env *env, struct osp_device *m,
        } 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);
@@ -747,7 +745,6 @@ out_last_used:
 out_proc:
        ptlrpc_lprocfs_unregister_obd(obd);
        lprocfs_obd_cleanup(obd);
-       obd_cleanup_client_import(obd);
        if (m->opd_symlink)
                lprocfs_remove(&m->opd_symlink);
        client_obd_cleanup(obd);
@@ -827,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);
 
@@ -910,15 +905,6 @@ static int osp_obd_connect(const struct lu_env *env, struct obd_export **exp,
        }
 
        ptlrpc_pinger_add_import(imp);
-
-       if (osp->opd_connect_mdt && data->ocd_index == 0) {
-               /* set seq controller export for MDC0 if exists */
-               struct seq_server_site *ss;
-
-               ss = lu_site2seq(osp2lu_dev(osp)->ld_site);
-               ss->ss_control_exp = class_export_get(*exp);
-               ss->ss_server_fld->lsf_control_exp = *exp;
-       }
 out:
        RETURN(rc);
 }
@@ -1029,7 +1015,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:
@@ -1037,7 +1023,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:
@@ -1048,7 +1034,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;
@@ -1082,7 +1068,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;
        }
@@ -1103,10 +1089,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;
 }
 
@@ -1202,8 +1188,11 @@ static int __init osp_mod_init(void)
 
        lprocfs_osp_init_vars(&lvars);
 
-       rc = class_register_type(&osp_obd_device_ops, NULL, lvars.module_vars,
-                                LUSTRE_OSP_NAME, &osp_device_type);
+       rc = class_register_type(&osp_obd_device_ops, NULL, NULL,
+#ifndef HAVE_ONLY_PROCFS_SEQ
+                               lvars.module_vars,
+#endif
+                               LUSTRE_OSP_NAME, &osp_device_type);
 
        /* create "osc" entry in procfs for compatibility purposes */
        if (rc != 0) {
@@ -1213,8 +1202,11 @@ static int __init osp_mod_init(void)
 
        lprocfs_lwp_init_vars(&lvars);
 
-       rc = class_register_type(&lwp_obd_device_ops, NULL, lvars.module_vars,
-                                LUSTRE_LWP_NAME, &lwp_device_type);
+       rc = class_register_type(&lwp_obd_device_ops, NULL, NULL,
+#ifndef HAVE_ONLY_PROCFS_SEQ
+                               lvars.module_vars,
+#endif
+                               LUSTRE_LWP_NAME, &lwp_device_type);
        if (rc != 0) {
                class_unregister_type(LUSTRE_OSP_NAME);
                lu_kmem_fini(osp_caches);