LU-4543 osd: return actual hash value for a record

[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 35bbed0..d4193cd 100644 (file)
--- a/lustre/osd-zfs/osd_handler.c
+++ b/lustre/osd-zfs/osd_handler.c
@@ -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 <lustre_param.h>
 #include <md_object.h>
 
 #include "osd_internal.h"
@@ -79,7 +77,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[] = {
        {
@@ -363,8 +361,6 @@ static void osd_conf_get(const struct lu_env *env,
        param->ddp_inodespace = OSD_DNODE_EST_COUNT;
        /* per-fragment overhead to be used by the client code */
        param->ddp_grant_frag = udmu_blk_insert_cost();
-
-       param->ddp_mnt = NULL;
 }
 
 /*
@@ -516,10 +512,11 @@ static void osd_xattr_changed_cb(void *arg, uint64_t newval)
 static int osd_mount(const struct lu_env *env,
                     struct osd_device *o, struct lustre_cfg *cfg)
 {
-       struct dsl_dataset *ds;
-       char      *dev  = lustre_cfg_string(cfg, 1);
-       dmu_buf_t *rootdb;
-       int        rc;
+       struct dsl_dataset      *ds;
+       char                    *dev  = lustre_cfg_string(cfg, 1);
+       dmu_buf_t               *rootdb;
+       dsl_pool_t              *dp;
+       int                      rc;
        ENTRY;
 
        if (o->od_objset.os != NULL)
@@ -532,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);
@@ -539,8 +539,12 @@ static int osd_mount(const struct lu_env *env,
        }
 
        ds = dmu_objset_ds(o->od_objset.os);
+       dp = dmu_objset_pool(o->od_objset.os);
        LASSERT(ds);
+       LASSERT(dp);
+       dsl_pool_config_enter(dp, FTAG);
        rc = dsl_prop_register(ds, "xattr", osd_xattr_changed_cb, o);
+       dsl_pool_config_exit(dp, FTAG);
        if (rc)
                CERROR("%s: cat not register xattr callback, ignore: %d\n",
                       o->od_svname, rc);
@@ -600,15 +604,15 @@ static void osd_umount(const struct lu_env *env, struct osd_device *o)
 {
        ENTRY;
 
-       if (cfs_atomic_read(&o->od_zerocopy_alloc))
+       if (atomic_read(&o->od_zerocopy_alloc))
                CERROR("%s: lost %d allocated page(s)\n", o->od_svname,
-                      cfs_atomic_read(&o->od_zerocopy_alloc));
-       if (cfs_atomic_read(&o->od_zerocopy_loan))
+                      atomic_read(&o->od_zerocopy_alloc));
+       if (atomic_read(&o->od_zerocopy_loan))
                CERROR("%s: lost %d loaned abuf(s)\n", o->od_svname,
-                      cfs_atomic_read(&o->od_zerocopy_loan));
-       if (cfs_atomic_read(&o->od_zerocopy_pin))
+                      atomic_read(&o->od_zerocopy_loan));
+       if (atomic_read(&o->od_zerocopy_pin))
                CERROR("%s: lost %d pinned dbuf(s)\n", o->od_svname,
-                      cfs_atomic_read(&o->od_zerocopy_pin));
+                      atomic_read(&o->od_zerocopy_pin));
 
        if (o->od_objset.os != NULL)
                udmu_objset_close(&o->od_objset);
@@ -742,21 +746,31 @@ static int osd_process_config(const struct lu_env *env,
                              struct lu_device *d, struct lustre_cfg *cfg)
 {
        struct osd_device       *o = osd_dev(d);
-       int                      err;
+       int                     rc;
        ENTRY;
 
        switch(cfg->lcfg_command) {
        case LCFG_SETUP:
-               err = osd_mount(env, o, cfg);
+               rc = osd_mount(env, o, cfg);
                break;
        case LCFG_CLEANUP:
-               err = osd_shutdown(env, o);
+               rc = osd_shutdown(env, o);
+               break;
+       case LCFG_PARAM: {
+               LASSERT(&o->od_dt_dev);
+               rc = class_process_proc_param(PARAM_OSD, lprocfs_osd_obd_vars,
+                                             cfg, &o->od_dt_dev);
+               if (rc > 0 || rc == -ENOSYS)
+                       rc = class_process_proc_param(PARAM_OST,
+                                                     lprocfs_osd_obd_vars,
+                                                     cfg, &o->od_dt_dev);
                break;
+       }
        default:
-               err = -ENOTTY;
+               rc = -ENOTTY;
        }
 
-       RETURN(err);
+       RETURN(rc);
 }
 
 static int osd_recovery_complete(const struct lu_env *env, struct lu_device *d)
@@ -895,9 +909,11 @@ int __init osd_init(void)
        if (rc)
                return rc;
 
-       rc = class_register_type(&osd_obd_device_ops, NULL,
-                                lprocfs_osd_module_vars,
-                                LUSTRE_OSD_ZFS_NAME, &osd_device_type);
+       rc = class_register_type(&osd_obd_device_ops, NULL, NULL,
+#ifndef HAVE_ONLY_PROCFS_SEQ
+                               lprocfs_osd_module_vars,
+#endif
+                               LUSTRE_OSD_ZFS_NAME, &osd_device_type);
        if (rc)
                lu_kmem_fini(osd_caches);
        return rc;