LU-3126 osd: remove fld lookup during configuration

[fs/lustre-release.git] / lustre / osd-zfs / osd_handler.c

diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
index 7b85f40..f41a9dd 100644 (file)
--- a/lustre/osd-zfs/osd_handler.c
+++ b/lustre/osd-zfs/osd_handler.c
@@ -28,7 +28,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2011, 2012 Whamcloud, Inc.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  * Use is subject to license terms.
  *
  */
@@ -44,9 +44,6 @@
  * Author: Johann Lombardi <johann@whamcloud.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_OSD
 
 #include <lustre_ver.h>
@@ -57,6 +54,7 @@
 #include <obd_class.h>
 #include <lustre_disk.h>
 #include <lustre_fid.h>
+#include <md_object.h>
 
 #include "osd_internal.h"
 
@@ -78,7 +76,7 @@ struct lu_context_key osd_key;
 static char *root_tag = "osd_mount, rootdb";
 
 /* Slab for OSD object allocation */
-cfs_mem_cache_t *osd_object_kmem;
+struct kmem_cache *osd_object_kmem;
 
 static struct lu_kmem_descr osd_caches[] = {
        {
@@ -209,11 +207,10 @@ static int osd_trans_start(const struct lu_env *env, struct dt_device *d,
                if (!lu_device_is_md(&d->dd_lu_dev) && rc == -ENOSPC)
                        CERROR("%s: failed to start transaction due to ENOSPC. "
                               "Metadata overhead is underestimated or "
-                              "grant_ratio is too low.\n",
-                              osd->od_dt_dev.dd_lu_dev.ld_obd->obd_name);
+                              "grant_ratio is too low.\n", osd->od_svname);
                else
                        CERROR("%s: can't assign tx: rc = %d\n",
-                              osd->od_dt_dev.dd_lu_dev.ld_obd->obd_name, rc);
+                              osd->od_svname, rc);
        } else {
                /* add commit callback */
                dmu_tx_callback_register(oh->ot_tx, osd_trans_commit_cb, oh);
@@ -300,7 +297,7 @@ static struct thandle *osd_trans_create(const struct lu_env *env,
        oh->ot_tx = tx;
        CFS_INIT_LIST_HEAD(&oh->ot_dcb_list);
        CFS_INIT_LIST_HEAD(&oh->ot_sa_list);
-       cfs_sema_init(&oh->ot_sa_lock, 1);
+       sema_init(&oh->ot_sa_lock, 1);
        memset(&oh->ot_quota_trans, 0, sizeof(oh->ot_quota_trans));
        th = &oh->ot_super;
        th->th_dev = dt;
@@ -320,7 +317,7 @@ int osd_statfs(const struct lu_env *env, struct dt_device *d,
        ENTRY;
 
        rc = udmu_objset_statfs(&osd->od_objset, osfs);
-       if (rc)
+       if (unlikely(rc))
                RETURN(rc);
        osfs->os_bavail -= min_t(obd_size,
                                 OSD_GRANT_FOR_LOCAL_OIDS / osfs->os_bsize,
@@ -384,6 +381,7 @@ static int osd_commit_async(const struct lu_env *env, struct dt_device *dev)
        tx_state_t        *tx = &dmu_objset_pool(osd->od_objset.os)->dp_tx;
        uint64_t           txg;
 
+       mutex_enter(&tx->tx_sync_lock);
        txg = tx->tx_open_txg + 1;
        if (tx->tx_quiesce_txg_waiting < txg) {
                tx->tx_quiesce_txg_waiting = txg;
@@ -531,6 +529,9 @@ static int osd_mount(const struct lu_env *env,
        strncpy(o->od_svname, lustre_cfg_string(cfg, 4),
                sizeof(o->od_svname) - 1);
 
+       if (server_name_is_ost(o->od_svname))
+               o->od_is_ost = 1;
+
        rc = -udmu_objset_open(o->od_mntdev, &o->od_objset);
        if (rc) {
                CERROR("can't open objset %s: %d\n", o->od_mntdev, rc);
@@ -569,6 +570,10 @@ static int osd_mount(const struct lu_env *env,
        if (rc)
                GOTO(err, rc);
 
+       rc = osd_convert_root_to_new_seq(env, o);
+       if (rc)
+               GOTO(err, rc);
+
        /* Use our own ZAP for inode accounting by default, this can be changed
         * via procfs to estimate the inode usage from the block usage */
        o->od_quota_iused_est = 0;
@@ -579,6 +584,14 @@ static int osd_mount(const struct lu_env *env,
 
        o->arc_prune_cb = arc_add_prune_callback(arc_prune_func, o);
 
+       /* initialize quota slave instance */
+       o->od_quota_slave = qsd_init(env, o->od_svname, &o->od_dt_dev,
+                                    o->od_proc_entry);
+       if (IS_ERR(o->od_quota_slave)) {
+               rc = PTR_ERR(o->od_quota_slave);
+               o->od_quota_slave = NULL;
+               GOTO(err, rc);
+       }
 err:
        RETURN(rc);
 }
@@ -688,6 +701,7 @@ static struct lu_device *osd_device_fini(const struct lu_env *env,
        ENTRY;
 
 
+       osd_shutdown(env, o);
        osd_oi_fini(env, o);
 
        if (o->od_objset.os) {
@@ -747,8 +761,17 @@ static int osd_process_config(const struct lu_env *env,
 
 static int osd_recovery_complete(const struct lu_env *env, struct lu_device *d)
 {
+       struct osd_device       *osd = osd_dev(d);
+       int                      rc = 0;
        ENTRY;
-       RETURN(0);
+
+       if (osd->od_quota_slave == NULL)
+               RETURN(0);
+
+       /* start qsd instance on recovery completion, this notifies the quota
+        * slave code that we are about to process new requests now */
+       rc = qsd_start(env, osd->od_quota_slave);
+       RETURN(rc);
 }
 
 /*
@@ -771,9 +794,9 @@ static int osd_obd_connect(const struct lu_env *env, struct obd_export **exp,
 
        *exp = class_conn2export(&conn);
 
-       cfs_spin_lock(&osd->od_objset.lock);
+       spin_lock(&osd->od_objset.lock);
        osd->od_connects++;
-       cfs_spin_unlock(&osd->od_objset.lock);
+       spin_unlock(&osd->od_objset.lock);
 
        RETURN(0);
 }
@@ -790,11 +813,11 @@ static int osd_obd_disconnect(struct obd_export *exp)
        ENTRY;
 
        /* Only disconnect the underlying layers on the final disconnect. */
-       cfs_spin_lock(&osd->od_objset.lock);
+       spin_lock(&osd->od_objset.lock);
        osd->od_connects--;
        if (osd->od_connects == 0)
                release = 1;
-       cfs_spin_unlock(&osd->od_objset.lock);
+       spin_unlock(&osd->od_objset.lock);
 
        rc = class_disconnect(exp); /* bz 9811 */
 
@@ -810,22 +833,9 @@ static int osd_prepare(const struct lu_env *env, struct lu_device *pdev,
        int                      rc = 0;
        ENTRY;
 
-       if (dev->ld_site && lu_device_is_md(dev->ld_site->ls_top_dev)) {
-               /* MDT/MDD still use old infrastructure to create
-                * special files */
-               rc = llo_local_objects_setup(env, lu2md_dev(pdev),
-                                            lu2dt_dev(dev));
-               if (rc)
-                       RETURN(rc);
-       }
-
-       /* initialize quota slave instance */
-       osd->od_quota_slave = qsd_init(env, osd->od_svname, &osd->od_dt_dev,
-                                      osd->od_proc_entry);
-       if (IS_ERR(osd->od_quota_slave)) {
-               rc = PTR_ERR(osd->od_quota_slave);
-               osd->od_quota_slave = NULL;
-       }
+       if (osd->od_quota_slave != NULL)
+               /* set up quota slave objects */
+               rc = qsd_prepare(env, osd->od_quota_slave);
 
        RETURN(rc);
 }