Whamcloud - gitweb
LU-14161 obdclass: fix some problems with obd_nid_hash
[fs/lustre-release.git] / lustre / obdclass / obd_config.c
index bcb9375..bf86016 100644 (file)
@@ -23,7 +23,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2016, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -36,6 +36,7 @@
 
 #define DEBUG_SUBSYSTEM S_CLASS
 
+#include <linux/kobject.h>
 #include <linux/string.h>
 
 #include <llog_swab.h>
 
 #include "llog_internal.h"
 
-static struct cfs_hash_ops uuid_hash_ops;
-static struct cfs_hash_ops nid_hash_ops;
+#ifdef HAVE_SERVER_SUPPORT
 static struct cfs_hash_ops nid_stat_hash_ops;
 static struct cfs_hash_ops gen_hash_ops;
+#endif /* HAVE_SERVER_SUPPORT */
+
+/*
+ * uuid<->export lustre hash operations
+ */
+/*
+ * NOTE: It is impossible to find an export that is in failed
+ *      state with this function
+ */
+static int
+uuid_keycmp(struct rhashtable_compare_arg *arg, const void *obj)
+{
+       const struct obd_uuid *uuid = arg->key;
+       const struct obd_export *exp = obj;
+
+       if (obd_uuid_equals(uuid, &exp->exp_client_uuid) &&
+           !exp->exp_failed)
+               return 0;
+       return -ESRCH;
+}
+
+static void
+obd_export_exit(void *vexport, void *data)
+{
+       struct obd_export *exp = vexport;
+
+       class_export_put(exp);
+}
+
+static const struct rhashtable_params uuid_hash_params = {
+       .key_len        = sizeof(struct obd_uuid),
+       .key_offset     = offsetof(struct obd_export, exp_client_uuid),
+       .head_offset    = offsetof(struct obd_export, exp_uuid_hash),
+       .obj_cmpfn      = uuid_keycmp,
+       .max_size       = MAX_OBD_DEVICES,
+       .automatic_shrinking = true,
+};
+
+int obd_uuid_add(struct obd_device *obd, struct obd_export *export)
+{
+       int rc;
+
+       class_export_get(export);
+       rcu_read_lock();
+       rc = rhashtable_lookup_insert_fast(&obd->obd_uuid_hash,
+                                          &export->exp_uuid_hash,
+                                          uuid_hash_params);
+       if (rc) {
+               class_export_put(export);
+               if (rc != -EEXIST) {
+                       /* map obscure error codes to -ENOMEM */
+                       rc = -ENOMEM;
+               } else {
+                       rc = -EALREADY;
+               }
+       }
+       rcu_read_unlock();
+
+       return rc;
+}
+EXPORT_SYMBOL(obd_uuid_add);
+
+void obd_uuid_del(struct obd_device *obd, struct obd_export *export)
+{
+       int rc;
+
+       rcu_read_lock();
+       rc = rhashtable_remove_fast(&obd->obd_uuid_hash,
+                                   &export->exp_uuid_hash,
+                                   uuid_hash_params);
+       if (!rc)
+               class_export_put(export);
+       rcu_read_unlock();
+}
+EXPORT_SYMBOL(obd_uuid_del);
+
+#ifdef HAVE_SERVER_SUPPORT
+/* obd_uuid_lookup() is used only server side by target_handle_connect(),
+ * mdt_hsm_agent_send(), and obd_export_evict_by_uuid().
+ */
+struct obd_export *obd_uuid_lookup(struct obd_device *obd,
+                                  struct obd_uuid *uuid)
+{
+       struct obd_export *export = NULL;
+
+       rcu_read_lock();
+       export = rhashtable_lookup_fast(&obd->obd_uuid_hash, uuid,
+                                       uuid_hash_params);
+       if (export && !refcount_inc_not_zero(&export->exp_handle.h_ref))
+               export = NULL;
+       rcu_read_unlock();
+
+       return export;
+}
+EXPORT_SYMBOL(obd_uuid_lookup);
+
+/*
+ * nid<->export hash operations
+ */
+static u32 nid_keyhash(const void *data, u32 key_len, u32 seed)
+{
+       const struct obd_export *exp = data;
+       void *key;
+
+       if (!exp->exp_connection)
+               return 0;
+
+       key = &exp->exp_connection->c_peer.nid;
+       return jhash2(key, key_len / sizeof(u32), seed);
+}
+
+/*
+ * NOTE: It is impossible to find an export that is in failed
+ *      state with this function
+ */
+static int
+nid_keycmp(struct rhashtable_compare_arg *arg, const void *obj)
+{
+       const lnet_nid_t *nid = arg->key;
+       const struct obd_export *exp = obj;
+
+       if (exp->exp_connection->c_peer.nid == *nid)
+               return 0;
+
+       return -ESRCH;
+}
+
+static void
+nid_export_exit(void *vexport, void *data)
+{
+       struct obd_export *exp = vexport;
+
+       class_export_put(exp);
+}
+
+static const struct rhashtable_params nid_hash_params = {
+       .key_len                = sizeof(lnet_nid_t),
+       .head_offset            = offsetof(struct obd_export, exp_nid_hash),
+       .obj_hashfn             = nid_keyhash,
+       .obj_cmpfn              = nid_keycmp,
+       .automatic_shrinking    = true,
+};
+
+int obd_nid_add(struct obd_device *obd, struct obd_export *exp)
+{
+       int rc;
+
+       if (exp == exp->exp_obd->obd_self_export || exp->exp_hashed)
+               return 0;
+
+       class_export_get(exp);
+       rc = rhltable_insert_key(&obd->obd_nid_hash,
+                                &exp->exp_connection->c_peer.nid,
+                                &exp->exp_nid_hash,
+                                nid_hash_params);
+       if (rc) {
+               class_export_put(exp);
+               /* map obscure error codes to -ENOMEM */
+               rc = -ENOMEM;
+       } else {
+               exp->exp_hashed = 1;
+       }
+       return rc;
+}
+EXPORT_SYMBOL(obd_nid_add);
+
+void obd_nid_del(struct obd_device *obd, struct obd_export *exp)
+{
+       int rc;
+
+       if (exp == exp->exp_obd->obd_self_export || !exp->exp_hashed)
+               return;
+
+       rc = rhltable_remove(&obd->obd_nid_hash, &exp->exp_nid_hash,
+                            nid_hash_params);
+       if (rc == 0) {
+               class_export_put(exp);
+               exp->exp_hashed = 0;
+       }
+}
+EXPORT_SYMBOL(obd_nid_del);
+
+int obd_nid_export_for_each(struct obd_device *obd, lnet_nid_t nid,
+                           int cb(struct obd_export *exp, void *data),
+                           void *data)
+{
+       struct rhlist_head *exports, *tmp;
+       struct obd_export *exp;
+       int ret = 0;
+
+       rcu_read_lock();
+       exports = rhltable_lookup(&obd->obd_nid_hash, &nid, nid_hash_params);
+       if (!exports) {
+               ret = -ENODEV;
+               goto out_unlock;
+       }
+
+       rhl_for_each_entry_rcu(exp, tmp, exports, exp_nid_hash) {
+               if (!exp->exp_failed && cb(exp, data))
+                       ret++;
+       }
+
+out_unlock:
+       rcu_read_unlock();
+       return ret;
+}
+EXPORT_SYMBOL(obd_nid_export_for_each);
+#endif /* HAVE_SERVER_SUPPORT */
 
 /*********** string parsing utils *********/
 
 /* returns 0 if we find this key in the buffer, else 1 */
 int class_find_param(char *buf, char *key, char **valp)
 {
-        char *ptr;
+       char *ptr;
 
-        if (!buf)
-                return 1;
+       if (!buf)
+               return 1;
 
-        if ((ptr = strstr(buf, key)) == NULL)
-                return 1;
+       ptr = strstr(buf, key);
+       if (!ptr)
+               return 1;
 
-        if (valp)
-                *valp = ptr + strlen(key);
+       if (valp)
+               *valp = ptr + strlen(key);
 
-        return 0;
+       return 0;
 }
 EXPORT_SYMBOL(class_find_param);
 
@@ -94,16 +303,16 @@ struct cfg_interop_param *class_find_old_param(const char *param,
        char *value = NULL;
        int   name_len = 0;
 
-       if (param == NULL || ptr == NULL)
+       if (!param || !ptr)
                RETURN(NULL);
 
        value = strchr(param, '=');
-       if (value == NULL)
-               name_len = strlen(param);
-       else
+       if (value)
                name_len = value - param;
+       else
+               name_len = strlen(param);
 
-       while (ptr->old_param != NULL) {
+       while (ptr->old_param) {
                if (strncmp(param, ptr->old_param, name_len) == 0 &&
                    name_len == strlen(ptr->old_param))
                        RETURN(ptr);
@@ -132,140 +341,144 @@ EXPORT_SYMBOL(class_find_old_param);
  */
 int class_get_next_param(char **params, char *copy)
 {
-        char *q1, *q2, *str;
-        int len;
-
-        str = *params;
-        while (*str == ' ')
-                str++;
-
-        if (*str == '\0') {
-                *params = NULL;
-                return 1;
-        }
-
-        while (1) {
-                q1 = strpbrk(str, " '\"");
-                if (q1 == NULL) {
-                        len = strlen(str);
-                        memcpy(copy, str, len);
-                        copy[len] = '\0';
-                        *params = NULL;
-                        return 0;
-                }
-                len = q1 - str;
-                if (*q1 == ' ') {
-                        memcpy(copy, str, len);
-                        copy[len] = '\0';
-                        *params = str + len;
-                        return 0;
-                }
-
-                memcpy(copy, str, len);
-                copy += len;
-
-                /* search for the matching closing quote */
-                str = q1 + 1;
-                q2 = strchr(str, *q1);
-                if (q2 == NULL) {
-                        CERROR("Unbalanced quota in parameters: \"%s\"\n",
-                               *params);
-                        return -EINVAL;
-                }
-                len = q2 - str;
-                memcpy(copy, str, len);
-                copy += len;
-                str = q2 + 1;
-        }
-        return 1;
+       char *q1, *q2, *str;
+       int len;
+
+       str = *params;
+       while (*str == ' ')
+               str++;
+
+       if (*str == '\0') {
+               *params = NULL;
+               return 1;
+       }
+
+       while (1) {
+               q1 = strpbrk(str, " '\"");
+               if (!q1) {
+                       len = strlen(str);
+                       memcpy(copy, str, len);
+                       copy[len] = '\0';
+                       *params = NULL;
+                       return 0;
+               }
+               len = q1 - str;
+               if (*q1 == ' ') {
+                       memcpy(copy, str, len);
+                       copy[len] = '\0';
+                       *params = str + len;
+                       return 0;
+               }
+
+               memcpy(copy, str, len);
+               copy += len;
+
+               /* search for the matching closing quote */
+               str = q1 + 1;
+               q2 = strchr(str, *q1);
+               if (!q2) {
+                       CERROR("Unbalanced quota in parameters: \"%s\"\n",
+                              *params);
+                       return -EINVAL;
+               }
+               len = q2 - str;
+               memcpy(copy, str, len);
+               copy += len;
+               str = q2 + 1;
+       }
+       return 1;
 }
 EXPORT_SYMBOL(class_get_next_param);
 
-/* returns 0 if this is the first key in the buffer, else 1.
-   valp points to first char after key. */
+/*
+ * returns 0 if this is the first key in the buffer, else 1.
+ * valp points to first char after key.
+ */
 int class_match_param(char *buf, const char *key, char **valp)
 {
-        if (!buf)
-                return 1;
+       if (!buf)
+               return 1;
 
-        if (memcmp(buf, key, strlen(key)) != 0)
-                return 1;
+       if (memcmp(buf, key, strlen(key)) != 0)
+               return 1;
 
-        if (valp)
-                *valp = buf + strlen(key);
+       if (valp)
+               *valp = buf + strlen(key);
 
-        return 0;
+       return 0;
 }
 EXPORT_SYMBOL(class_match_param);
 
 static int parse_nid(char *buf, void *value, int quiet)
 {
-        lnet_nid_t *nid = (lnet_nid_t *)value;
+       lnet_nid_t *nid = (lnet_nid_t *)value;
 
-        *nid = libcfs_str2nid(buf);
-        if (*nid != LNET_NID_ANY)
-                return 0;
+       *nid = libcfs_str2nid(buf);
+       if (*nid != LNET_NID_ANY)
+               return 0;
 
        if (!quiet)
                LCONSOLE_ERROR_MSG(0x159, "Can't parse NID '%s'\n", buf);
-        return -EINVAL;
+       return -EINVAL;
 }
 
 static int parse_net(char *buf, void *value)
 {
-        __u32 *net = (__u32 *)value;
+       __u32 *net = (__u32 *)value;
 
-        *net = libcfs_str2net(buf);
-        CDEBUG(D_INFO, "Net %s\n", libcfs_net2str(*net));
-        return 0;
+       *net = libcfs_str2net(buf);
+       CDEBUG(D_INFO, "Net %s\n", libcfs_net2str(*net));
+       return 0;
 }
 
 enum {
-        CLASS_PARSE_NID = 1,
-        CLASS_PARSE_NET,
+       CLASS_PARSE_NID = 1,
+       CLASS_PARSE_NET,
 };
 
-/* 0 is good nid,
-   1 not found
-   < 0 error
-   endh is set to next separator */
+/*
+ * 0 is good NID,
+ * 1 not found
+ * < 0 error
+ * endh is set to next separator
+ */
 static int class_parse_value(char *buf, int opc, void *value, char **endh,
                             int quiet)
 {
-        char *endp;
-        char  tmp;
-        int   rc = 0;
-
-        if (!buf)
-                return 1;
-        while (*buf == ',' || *buf == ':')
-                buf++;
-        if (*buf == ' ' || *buf == '/' || *buf == '\0')
-                return 1;
-
-        /* nid separators or end of nids */
-        endp = strpbrk(buf, ",: /");
-        if (endp == NULL)
-                endp = buf + strlen(buf);
-
-        tmp = *endp;
-        *endp = '\0';
-        switch (opc) {
-        default:
-                LBUG();
-        case CLASS_PARSE_NID:
+       char *endp;
+       char  tmp;
+       int   rc = 0;
+
+       if (!buf)
+               return 1;
+       while (*buf == ',' || *buf == ':')
+               buf++;
+       if (*buf == ' ' || *buf == '/' || *buf == '\0')
+               return 1;
+
+       /* NID separators or end of NIDs */
+       endp = strpbrk(buf, ",: /");
+       if (!endp)
+               endp = buf + strlen(buf);
+
+       tmp = *endp;
+       *endp = '\0';
+       switch (opc) {
+       default:
+               LBUG();
+       case CLASS_PARSE_NID:
                rc = parse_nid(buf, value, quiet);
-                break;
-        case CLASS_PARSE_NET:
-                rc = parse_net(buf, value);
-                break;
-        }
-        *endp = tmp;
-        if (rc != 0)
-                return rc;
-        if (endh)
-                *endh = endp;
-        return 0;
+               break;
+       case CLASS_PARSE_NET:
+               rc = parse_net(buf, value);
+               break;
+       }
+       *endp = tmp;
+       if (rc != 0)
+               return rc;
+       if (endh)
+               *endh = endp;
+       return 0;
 }
 
 int class_parse_nid(char *buf, lnet_nid_t *nid, char **endh)
@@ -285,42 +498,47 @@ int class_parse_net(char *buf, __u32 *net, char **endh)
        return class_parse_value(buf, CLASS_PARSE_NET, (void *)net, endh, 0);
 }
 
-/* 1 param contains key and match
+/*
+ * 1 param contains key and match
  * 0 param contains key and not match
  * -1 param does not contain key
  */
 int class_match_nid(char *buf, char *key, lnet_nid_t nid)
 {
-        lnet_nid_t tmp;
-        int   rc = -1;
-
-        while (class_find_param(buf, key, &buf) == 0) {
-                /* please restrict to the nids pertaining to
-                 * the specified nids */
-                while (class_parse_nid(buf, &tmp, &buf) == 0) {
-                        if (tmp == nid)
-                                return 1;
-                }
-                rc = 0;
-        }
-        return rc;
+       lnet_nid_t tmp;
+       int rc = -1;
+
+       while (class_find_param(buf, key, &buf) == 0) {
+               /*
+                * please restrict to the NIDs pertaining to
+                * the specified NIDs
+                */
+               while (class_parse_nid(buf, &tmp, &buf) == 0) {
+                       if (tmp == nid)
+                               return 1;
+               }
+               rc = 0;
+       }
+       return rc;
 }
 
 int class_match_net(char *buf, char *key, __u32 net)
 {
-        __u32 tmp;
-        int   rc = -1;
-
-        while (class_find_param(buf, key, &buf) == 0) {
-                /* please restrict to the nids pertaining to
-                 * the specified networks */
-                while (class_parse_net(buf, &tmp, &buf) == 0) {
-                        if (tmp == net)
-                                return 1;
-                }
-                rc = 0;
-        }
-        return rc;
+       __u32 tmp;
+       int rc = -1;
+
+       while (class_find_param(buf, key, &buf) == 0) {
+               /*
+                * please restrict to the NIDs pertaining to
+                * the specified networks
+                */
+               while (class_parse_net(buf, &tmp, &buf) == 0) {
+                       if (tmp == net)
+                               return 1;
+               }
+               rc = 0;
+       }
+       return rc;
 }
 
 char *lustre_cfg_string(struct lustre_cfg *lcfg, u32 index)
@@ -360,193 +578,149 @@ EXPORT_SYMBOL(lustre_cfg_string);
 /********************** class fns **********************/
 
 /**
- * Create a new obd device and set the type, name and uuid.  If successful,
+ * Create a new OBD device and set the type, name and uuid.  If successful,
  * the new device can be accessed by either name or uuid.
  */
 int class_attach(struct lustre_cfg *lcfg)
 {
-        struct obd_device *obd = NULL;
-        char *typename, *name, *uuid;
-        int rc, len;
-        ENTRY;
-
-        if (!LUSTRE_CFG_BUFLEN(lcfg, 1)) {
-                CERROR("No type passed!\n");
-                RETURN(-EINVAL);
-        }
-        typename = lustre_cfg_string(lcfg, 1);
-
-        if (!LUSTRE_CFG_BUFLEN(lcfg, 0)) {
-                CERROR("No name passed!\n");
-                RETURN(-EINVAL);
-        }
-        name = lustre_cfg_string(lcfg, 0);
-
-        if (!LUSTRE_CFG_BUFLEN(lcfg, 2)) {
-                CERROR("No UUID passed!\n");
-                RETURN(-EINVAL);
-        }
-        uuid = lustre_cfg_string(lcfg, 2);
-
-        CDEBUG(D_IOCTL, "attach type %s name: %s uuid: %s\n",
-               MKSTR(typename), MKSTR(name), MKSTR(uuid));
-
-        obd = class_newdev(typename, name);
-        if (IS_ERR(obd)) {
-                /* Already exists or out of obds */
-                rc = PTR_ERR(obd);
-                obd = NULL;
-                CERROR("Cannot create device %s of type %s : %d\n",
-                       name, typename, rc);
-                GOTO(out, rc);
-        }
-        LASSERTF(obd != NULL, "Cannot get obd device %s of type %s\n",
-                 name, typename);
-        LASSERTF(obd->obd_magic == OBD_DEVICE_MAGIC,
-                 "obd %p obd_magic %08X != %08X\n",
-                 obd, obd->obd_magic, OBD_DEVICE_MAGIC);
-        LASSERTF(strncmp(obd->obd_name, name, strlen(name)) == 0,
-                 "%p obd_name %s != %s\n", obd, obd->obd_name, name);
-
-       rwlock_init(&obd->obd_pool_lock);
-       obd->obd_pool_limit = 0;
-       obd->obd_pool_slv = 0;
-
-       INIT_LIST_HEAD(&obd->obd_exports);
-       INIT_LIST_HEAD(&obd->obd_unlinked_exports);
-       INIT_LIST_HEAD(&obd->obd_delayed_exports);
-       INIT_LIST_HEAD(&obd->obd_exports_timed);
-       INIT_LIST_HEAD(&obd->obd_nid_stats);
-       spin_lock_init(&obd->obd_nid_lock);
-       spin_lock_init(&obd->obd_dev_lock);
-       mutex_init(&obd->obd_dev_mutex);
-       spin_lock_init(&obd->obd_osfs_lock);
-       /* obd->obd_osfs_age must be set to a value in the distant
-        * past to guarantee a fresh statfs is fetched on mount. */
-       obd->obd_osfs_age = cfs_time_shift_64(-1000);
-
-       /* XXX belongs in setup not attach  */
-       init_rwsem(&obd->obd_observer_link_sem);
-       /* recovery data */
-       init_timer(&obd->obd_recovery_timer);
-       spin_lock_init(&obd->obd_recovery_task_lock);
-       init_waitqueue_head(&obd->obd_next_transno_waitq);
-       init_waitqueue_head(&obd->obd_evict_inprogress_waitq);
-       INIT_LIST_HEAD(&obd->obd_req_replay_queue);
-       INIT_LIST_HEAD(&obd->obd_lock_replay_queue);
-       INIT_LIST_HEAD(&obd->obd_final_req_queue);
-       INIT_LIST_HEAD(&obd->obd_evict_list);
-       INIT_LIST_HEAD(&obd->obd_lwp_list);
-
-       llog_group_init(&obd->obd_olg);
-
-       obd->obd_conn_inprogress = 0;
-
-        len = strlen(uuid);
-        if (len >= sizeof(obd->obd_uuid)) {
-                CERROR("uuid must be < %d bytes long\n",
-                       (int)sizeof(obd->obd_uuid));
-                GOTO(out, rc = -EINVAL);
-        }
-        memcpy(obd->obd_uuid.uuid, uuid, len);
-
-        /* Detach drops this */
-       spin_lock(&obd->obd_dev_lock);
-       atomic_set(&obd->obd_refcount, 1);
-       spin_unlock(&obd->obd_dev_lock);
-        lu_ref_init(&obd->obd_reference);
-        lu_ref_add(&obd->obd_reference, "attach", obd);
+       struct obd_export *exp;
+       struct obd_device *obd = NULL;
+       char *typename, *name, *uuid;
+       int rc, len;
+
+       ENTRY;
 
-        obd->obd_attached = 1;
-        CDEBUG(D_IOCTL, "OBD: dev %d attached type %s with refcount %d\n",
+       if (!LUSTRE_CFG_BUFLEN(lcfg, 1)) {
+               CERROR("No type passed!\n");
+               RETURN(-EINVAL);
+       }
+       typename = lustre_cfg_string(lcfg, 1);
+
+       if (!LUSTRE_CFG_BUFLEN(lcfg, 0)) {
+               CERROR("No name passed!\n");
+               RETURN(-EINVAL);
+       }
+       name = lustre_cfg_string(lcfg, 0);
+       if (!LUSTRE_CFG_BUFLEN(lcfg, 2)) {
+               CERROR("No UUID passed!\n");
+               RETURN(-EINVAL);
+       }
+
+       uuid = lustre_cfg_string(lcfg, 2);
+       len = strlen(uuid);
+       if (len >= sizeof(obd->obd_uuid)) {
+               CERROR("%s: uuid must be < %d bytes long\n",
+                      name, (int)sizeof(obd->obd_uuid));
+               RETURN(-EINVAL);
+       }
+
+       obd = class_newdev(typename, name, uuid);
+       if (IS_ERR(obd)) { /* Already exists or out of obds */
+               rc = PTR_ERR(obd);
+               CERROR("Cannot create device %s of type %s : %d\n",
+                      name, typename, rc);
+               RETURN(rc);
+       }
+       LASSERTF(obd->obd_magic == OBD_DEVICE_MAGIC,
+                "obd %p obd_magic %08X != %08X\n",
+                obd, obd->obd_magic, OBD_DEVICE_MAGIC);
+       LASSERTF(strncmp(obd->obd_name, name, strlen(name)) == 0,
+                "%p obd_name %s != %s\n", obd, obd->obd_name, name);
+
+       exp = class_new_export_self(obd, &obd->obd_uuid);
+       if (IS_ERR(exp)) {
+               rc = PTR_ERR(exp);
+               class_free_dev(obd);
+               RETURN(rc);
+       }
+
+       obd->obd_self_export = exp;
+       list_del_init(&exp->exp_obd_chain_timed);
+       class_export_put(exp);
+
+       rc = class_register_device(obd);
+       if (rc != 0) {
+               class_decref(obd, "newdev", obd);
+               RETURN(rc);
+       }
+
+       obd->obd_attached = 1;
+       CDEBUG(D_IOCTL, "OBD: dev %d attached type %s with refcount %d\n",
               obd->obd_minor, typename, atomic_read(&obd->obd_refcount));
-        RETURN(0);
- out:
-        if (obd != NULL) {
-                class_release_dev(obd);
-        }
-        return rc;
+
+       RETURN(0);
 }
 EXPORT_SYMBOL(class_attach);
 
-/** Create hashes, self-export, and call type-specific setup.
+/**
+ * Create hashes, self-export, and call type-specific setup.
  * Setup is effectively the "start this obd" call.
  */
 int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
 {
-        int err = 0;
-        struct obd_export *exp;
-        ENTRY;
-
-        LASSERT(obd != NULL);
-        LASSERTF(obd == class_num2obd(obd->obd_minor),
-                 "obd %p != obd_devs[%d] %p\n",
-                 obd, obd->obd_minor, class_num2obd(obd->obd_minor));
-        LASSERTF(obd->obd_magic == OBD_DEVICE_MAGIC,
-                 "obd %p obd_magic %08x != %08x\n",
-                 obd, obd->obd_magic, OBD_DEVICE_MAGIC);
-
-        /* have we attached a type to this device? */
-        if (!obd->obd_attached) {
-                CERROR("Device %d not attached\n", obd->obd_minor);
-                RETURN(-ENODEV);
-        }
-
-        if (obd->obd_set_up) {
-                CERROR("Device %d already setup (type %s)\n",
-                       obd->obd_minor, obd->obd_type->typ_name);
-                RETURN(-EEXIST);
-        }
-
-        /* is someone else setting us up right now? (attach inits spinlock) */
+       int err = 0;
+
+       ENTRY;
+
+       LASSERT(obd != NULL);
+       LASSERTF(obd == class_num2obd(obd->obd_minor),
+                "obd %p != obd_devs[%d] %p\n",
+                obd, obd->obd_minor, class_num2obd(obd->obd_minor));
+       LASSERTF(obd->obd_magic == OBD_DEVICE_MAGIC,
+                "obd %p obd_magic %08x != %08x\n",
+                obd, obd->obd_magic, OBD_DEVICE_MAGIC);
+
+       /* have we attached a type to this device? */
+       if (!obd->obd_attached) {
+               CERROR("Device %d not attached\n", obd->obd_minor);
+               RETURN(-ENODEV);
+       }
+
+       if (obd->obd_set_up) {
+               CERROR("Device %d already setup (type %s)\n",
+                      obd->obd_minor, obd->obd_type->typ_name);
+               RETURN(-EEXIST);
+       }
+
+       /* is someone else setting us up right now? (attach inits spinlock) */
        spin_lock(&obd->obd_dev_lock);
        if (obd->obd_starting) {
                spin_unlock(&obd->obd_dev_lock);
-                CERROR("Device %d setup in progress (type %s)\n",
-                       obd->obd_minor, obd->obd_type->typ_name);
-                RETURN(-EEXIST);
-        }
-        /* just leave this on forever.  I can't use obd_set_up here because
-           other fns check that status, and we're not actually set up yet. */
-        obd->obd_starting = 1;
-        obd->obd_uuid_hash = NULL;
-        obd->obd_nid_hash = NULL;
-        obd->obd_nid_stats_hash = NULL;
+               CERROR("Device %d setup in progress (type %s)\n",
+                      obd->obd_minor, obd->obd_type->typ_name);
+               RETURN(-EEXIST);
+       }
+       /*
+        * just leave this on forever.  I can't use obd_set_up here because
+        * other fns check that status, and we're not actually set up yet.
+        */
+       obd->obd_starting = 1;
+       obd->obd_nid_stats_hash = NULL;
        obd->obd_gen_hash = NULL;
        spin_unlock(&obd->obd_dev_lock);
 
-        /* create an uuid-export lustre hash */
-        obd->obd_uuid_hash = cfs_hash_create("UUID_HASH",
-                                             HASH_UUID_CUR_BITS,
-                                             HASH_UUID_MAX_BITS,
-                                             HASH_UUID_BKT_BITS, 0,
-                                             CFS_HASH_MIN_THETA,
-                                             CFS_HASH_MAX_THETA,
-                                             &uuid_hash_ops, CFS_HASH_DEFAULT);
-        if (!obd->obd_uuid_hash)
-                GOTO(err_hash, err = -ENOMEM);
-
-        /* create a nid-export lustre hash */
-        obd->obd_nid_hash = cfs_hash_create("NID_HASH",
-                                            HASH_NID_CUR_BITS,
-                                            HASH_NID_MAX_BITS,
-                                            HASH_NID_BKT_BITS, 0,
-                                            CFS_HASH_MIN_THETA,
-                                            CFS_HASH_MAX_THETA,
-                                            &nid_hash_ops, CFS_HASH_DEFAULT);
-        if (!obd->obd_nid_hash)
-                GOTO(err_hash, err = -ENOMEM);
-
-        /* create a nid-stats lustre hash */
-        obd->obd_nid_stats_hash = cfs_hash_create("NID_STATS",
-                                                  HASH_NID_STATS_CUR_BITS,
-                                                  HASH_NID_STATS_MAX_BITS,
-                                                  HASH_NID_STATS_BKT_BITS, 0,
-                                                  CFS_HASH_MIN_THETA,
-                                                  CFS_HASH_MAX_THETA,
-                                                  &nid_stat_hash_ops, CFS_HASH_DEFAULT);
-        if (!obd->obd_nid_stats_hash)
-                GOTO(err_hash, err = -ENOMEM);
+       /* create an uuid-export lustre hash */
+       err = rhashtable_init(&obd->obd_uuid_hash, &uuid_hash_params);
+       if (err)
+               GOTO(err_starting, err);
+
+#ifdef HAVE_SERVER_SUPPORT
+       /* create a nid-export lustre hash */
+       err = rhltable_init(&obd->obd_nid_hash, &nid_hash_params);
+       if (err)
+               GOTO(err_uuid_hash, err = -ENOMEM);
+
+       /* create a nid-stats lustre hash */
+       obd->obd_nid_stats_hash = cfs_hash_create("NID_STATS",
+                                                 HASH_NID_STATS_CUR_BITS,
+                                                 HASH_NID_STATS_MAX_BITS,
+                                                 HASH_NID_STATS_BKT_BITS, 0,
+                                                 CFS_HASH_MIN_THETA,
+                                                 CFS_HASH_MAX_THETA,
+                                                 &nid_stat_hash_ops,
+                                                 CFS_HASH_DEFAULT);
+       if (!obd->obd_nid_stats_hash)
+               GOTO(err_nid_hash, err = -ENOMEM);
 
        /* create a client_generation-export lustre hash */
        obd->obd_gen_hash = cfs_hash_create("UUID_HASH",
@@ -557,70 +731,64 @@ int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
                                            CFS_HASH_MAX_THETA,
                                            &gen_hash_ops, CFS_HASH_DEFAULT);
        if (!obd->obd_gen_hash)
-               GOTO(err_hash, err = -ENOMEM);
-
-        exp = class_new_export(obd, &obd->obd_uuid);
-        if (IS_ERR(exp))
-                GOTO(err_hash, err = PTR_ERR(exp));
-
-        obd->obd_self_export = exp;
-       list_del_init(&exp->exp_obd_chain_timed);
-        class_export_put(exp);
+               GOTO(err_nid_stats_hash, err = -ENOMEM);
+#endif /* HAVE_SERVER_SUPPORT */
 
-        err = obd_setup(obd, lcfg);
-        if (err)
-                GOTO(err_exp, err);
+       err = obd_setup(obd, lcfg);
+       if (err)
+#ifdef HAVE_SERVER_SUPPORT
+               GOTO(err_gen_hash, err);
+#else
+               GOTO(err_uuid_hash, err);
+#endif /* ! HAVE_SERVER_SUPPORT */
 
-        obd->obd_set_up = 1;
+       obd->obd_set_up = 1;
 
        spin_lock(&obd->obd_dev_lock);
        /* cleanup drops this */
        class_incref(obd, "setup", obd);
        spin_unlock(&obd->obd_dev_lock);
 
-        CDEBUG(D_IOCTL, "finished setup of obd %s (uuid %s)\n",
-               obd->obd_name, obd->obd_uuid.uuid);
-
-        RETURN(0);
-err_exp:
-        if (obd->obd_self_export) {
-                class_unlink_export(obd->obd_self_export);
-                obd->obd_self_export = NULL;
-        }
-err_hash:
-        if (obd->obd_uuid_hash) {
-                cfs_hash_putref(obd->obd_uuid_hash);
-                obd->obd_uuid_hash = NULL;
-        }
-        if (obd->obd_nid_hash) {
-                cfs_hash_putref(obd->obd_nid_hash);
-                obd->obd_nid_hash = NULL;
-        }
-        if (obd->obd_nid_stats_hash) {
-                cfs_hash_putref(obd->obd_nid_stats_hash);
-                obd->obd_nid_stats_hash = NULL;
-        }
+       CDEBUG(D_IOCTL, "finished setup of obd %s (uuid %s)\n",
+              obd->obd_name, obd->obd_uuid.uuid);
+
+       RETURN(0);
+
+#ifdef HAVE_SERVER_SUPPORT
+err_gen_hash:
        if (obd->obd_gen_hash) {
                cfs_hash_putref(obd->obd_gen_hash);
                obd->obd_gen_hash = NULL;
        }
-        obd->obd_starting = 0;
-        CERROR("setup %s failed (%d)\n", obd->obd_name, err);
-        return err;
+err_nid_stats_hash:
+       if (obd->obd_nid_stats_hash) {
+               cfs_hash_putref(obd->obd_nid_stats_hash);
+               obd->obd_nid_stats_hash = NULL;
+       }
+err_nid_hash:
+       rhltable_destroy(&obd->obd_nid_hash);
+#endif /* HAVE_SERVER_SUPPORT */
+err_uuid_hash:
+       rhashtable_destroy(&obd->obd_uuid_hash);
+err_starting:
+       obd->obd_starting = 0;
+       CERROR("setup %s failed (%d)\n", obd->obd_name, err);
+       return err;
 }
 EXPORT_SYMBOL(class_setup);
 
-/** We have finished using this obd and are ready to destroy it.
+/**
+ * We have finished using this OBD and are ready to destroy it.
  * There can be no more references to this obd.
  */
 int class_detach(struct obd_device *obd, struct lustre_cfg *lcfg)
 {
-        ENTRY;
+       ENTRY;
 
-        if (obd->obd_set_up) {
-                CERROR("OBD device %d still set up\n", obd->obd_minor);
-                RETURN(-EBUSY);
-        }
+       if (obd->obd_set_up) {
+               CERROR("OBD device %d still set up\n", obd->obd_minor);
+               RETURN(-EBUSY);
+       }
 
        spin_lock(&obd->obd_dev_lock);
        if (!obd->obd_attached) {
@@ -631,15 +799,20 @@ int class_detach(struct obd_device *obd, struct lustre_cfg *lcfg)
        obd->obd_attached = 0;
        spin_unlock(&obd->obd_dev_lock);
 
-        CDEBUG(D_IOCTL, "detach on obd %s (uuid %s)\n",
-               obd->obd_name, obd->obd_uuid.uuid);
+       /* cleanup in progress. we don't like to find this device after now */
+       class_unregister_device(obd);
+
+       CDEBUG(D_IOCTL, "detach on obd %s (uuid %s)\n",
+              obd->obd_name, obd->obd_uuid.uuid);
 
-        class_decref(obd, "attach", obd);
-        RETURN(0);
+       class_decref(obd, "newdev", obd);
+
+       RETURN(0);
 }
 EXPORT_SYMBOL(class_detach);
 
-/** Start shutting down the obd.  There may be in-progess ops when
+/**
+ * Start shutting down the OBD.  There may be in-progess ops when
  * this is called.  We tell them to start shutting down with a call
  * to class_disconnect_exports().
  */
@@ -664,6 +837,11 @@ int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg)
        }
        /* Leave this on forever */
        obd->obd_stopping = 1;
+       /*
+        * function can't return error after that point, so clear setup flag
+        * as early as possible to avoid finding via obd_devs / hash
+        */
+       obd->obd_set_up = 0;
        spin_unlock(&obd->obd_dev_lock);
 
        /* wait for already-arrived-connections to finish. */
@@ -680,9 +858,13 @@ int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg)
                        case 'A':
                                LCONSOLE_WARN("Failing over %s\n",
                                              obd->obd_name);
+                               spin_lock(&obd->obd_dev_lock);
                                obd->obd_fail = 1;
+#ifdef HAVE_SERVER_SUPPORT
                                obd->obd_no_transno = 1;
+#endif
                                obd->obd_no_recov = 1;
+                               spin_unlock(&obd->obd_dev_lock);
                                if (OBP(obd, iocontrol)) {
                                        obd_iocontrol(OBD_IOC_SYNC,
                                                      obd->obd_self_export,
@@ -696,17 +878,11 @@ int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg)
 
        LASSERT(obd->obd_self_export);
 
-       /* The three references that should be remaining are the
-        * obd_self_export and the attach and setup references. */
-       if (atomic_read(&obd->obd_refcount) > 3) {
-               /* refcounf - 3 might be the number of real exports
-                  (excluding self export). But class_incref is called
-                  by other things as well, so don't count on it. */
-               CDEBUG(D_IOCTL, "%s: forcing exports to disconnect: %d\n",
-                      obd->obd_name, atomic_read(&obd->obd_refcount) - 3);
-               dump_exports(obd, 0, D_HA);
-               class_disconnect_exports(obd);
-       }
+       CDEBUG(D_IOCTL, "%s: forcing exports to disconnect: %d/%d\n",
+              obd->obd_name, obd->obd_num_exports,
+              atomic_read(&obd->obd_refcount) - 2);
+       dump_exports(obd, 0, D_HA);
+       class_disconnect_exports(obd);
 
        /* Precleanup, we must make sure all exports get destroyed. */
        err = obd_precleanup(obd);
@@ -715,16 +891,11 @@ int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg)
                       obd->obd_name, err);
 
        /* destroy an uuid-export hash body */
-       if (obd->obd_uuid_hash) {
-               cfs_hash_putref(obd->obd_uuid_hash);
-               obd->obd_uuid_hash = NULL;
-       }
-
+       rhashtable_free_and_destroy(&obd->obd_uuid_hash, obd_export_exit,
+                                   NULL);
+#ifdef HAVE_SERVER_SUPPORT
        /* destroy a nid-export hash body */
-       if (obd->obd_nid_hash) {
-               cfs_hash_putref(obd->obd_nid_hash);
-               obd->obd_nid_hash = NULL;
-       }
+       rhltable_free_and_destroy(&obd->obd_nid_hash, nid_export_exit, NULL);
 
        /* destroy a nid-stats hash body */
        if (obd->obd_nid_stats_hash) {
@@ -737,7 +908,7 @@ int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg)
                cfs_hash_putref(obd->obd_gen_hash);
                obd->obd_gen_hash = NULL;
        }
-
+#endif /* HAVE_SERVER_SUPPORT */
        class_decref(obd, "setup", obd);
        obd->obd_set_up = 0;
 
@@ -745,132 +916,121 @@ int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg)
 }
 
 struct obd_device *class_incref(struct obd_device *obd,
-                                const char *scope, const void *source)
+                               const char *scope,
+                               const void *source)
 {
-        lu_ref_add_atomic(&obd->obd_reference, scope, source);
+       lu_ref_add_atomic(&obd->obd_reference, scope, source);
        atomic_inc(&obd->obd_refcount);
-        CDEBUG(D_INFO, "incref %s (%p) now %d\n", obd->obd_name, obd,
+       CDEBUG(D_INFO, "incref %s (%p) now %d\n", obd->obd_name, obd,
               atomic_read(&obd->obd_refcount));
 
-        return obd;
+       return obd;
 }
 EXPORT_SYMBOL(class_incref);
 
 void class_decref(struct obd_device *obd, const char *scope, const void *source)
 {
-       int err;
-       int refs;
+       int last;
 
-       spin_lock(&obd->obd_dev_lock);
-       atomic_dec(&obd->obd_refcount);
-       refs = atomic_read(&obd->obd_refcount);
-       spin_unlock(&obd->obd_dev_lock);
+       CDEBUG(D_INFO, "Decref %s (%p) now %d - %s\n", obd->obd_name, obd,
+              atomic_read(&obd->obd_refcount), scope);
+
+       LASSERT(obd->obd_num_exports >= 0);
+       last = atomic_dec_and_test(&obd->obd_refcount);
        lu_ref_del(&obd->obd_reference, scope, source);
 
-       CDEBUG(D_INFO, "Decref %s (%p) now %d\n", obd->obd_name, obd, refs);
-
-       if ((refs == 1) && obd->obd_stopping) {
-               /* All exports have been destroyed; there should
-                  be no more in-progress ops by this point.*/
-
-               spin_lock(&obd->obd_self_export->exp_lock);
-               obd->obd_self_export->exp_flags |= exp_flags_from_obd(obd);
-               spin_unlock(&obd->obd_self_export->exp_lock);
-
-                /* note that we'll recurse into class_decref again */
-                class_unlink_export(obd->obd_self_export);
-                return;
-        }
-
-        if (refs == 0) {
-                CDEBUG(D_CONFIG, "finishing cleanup of obd %s (%s)\n",
-                       obd->obd_name, obd->obd_uuid.uuid);
-                LASSERT(!obd->obd_attached);
-                if (obd->obd_stopping) {
-                        /* If we're not stopping, we were never set up */
-                        err = obd_cleanup(obd);
-                        if (err)
-                                CERROR("Cleanup %s returned %d\n",
-                                       obd->obd_name, err);
-                }
-
-                class_release_dev(obd);
-        }
+       if (last) {
+               struct obd_export *exp;
+
+               LASSERT(!obd->obd_attached);
+               /*
+                * All exports have been destroyed; there should
+                * be no more in-progress ops by this point.
+                */
+               exp = obd->obd_self_export;
+
+               if (exp) {
+                       exp->exp_flags |= exp_flags_from_obd(obd);
+                       class_unlink_export(exp);
+               }
+       }
 }
 EXPORT_SYMBOL(class_decref);
 
-/** Add a failover nid location.
- * Client obd types contact server obd types using this nid list.
+/**
+ * Add a failover NID location.
+ * Client OBD types contact server OBD types using this NID list.
  */
 int class_add_conn(struct obd_device *obd, struct lustre_cfg *lcfg)
 {
-        struct obd_import *imp;
-        struct obd_uuid uuid;
-        int rc;
-        ENTRY;
-
-        if (LUSTRE_CFG_BUFLEN(lcfg, 1) < 1 ||
-            LUSTRE_CFG_BUFLEN(lcfg, 1) > sizeof(struct obd_uuid)) {
-                CERROR("invalid conn_uuid\n");
-                RETURN(-EINVAL);
-        }
-        if (strcmp(obd->obd_type->typ_name, LUSTRE_MDC_NAME) &&
-            strcmp(obd->obd_type->typ_name, LUSTRE_OSC_NAME) &&
+       struct obd_import *imp;
+       struct obd_uuid uuid;
+       int rc;
+
+       ENTRY;
+
+       if (LUSTRE_CFG_BUFLEN(lcfg, 1) < 1 ||
+           LUSTRE_CFG_BUFLEN(lcfg, 1) > sizeof(struct obd_uuid)) {
+               CERROR("invalid conn_uuid\n");
+               RETURN(-EINVAL);
+       }
+       if (strcmp(obd->obd_type->typ_name, LUSTRE_MDC_NAME) &&
+           strcmp(obd->obd_type->typ_name, LUSTRE_OSC_NAME) &&
            strcmp(obd->obd_type->typ_name, LUSTRE_OSP_NAME) &&
            strcmp(obd->obd_type->typ_name, LUSTRE_LWP_NAME) &&
-            strcmp(obd->obd_type->typ_name, LUSTRE_MGC_NAME)) {
-                CERROR("can't add connection on non-client dev\n");
-                RETURN(-EINVAL);
-        }
+           strcmp(obd->obd_type->typ_name, LUSTRE_MGC_NAME)) {
+               CERROR("can't add connection on non-client dev\n");
+               RETURN(-EINVAL);
+       }
 
-        imp = obd->u.cli.cl_import;
-        if (!imp) {
-                CERROR("try to add conn on immature client dev\n");
-                RETURN(-EINVAL);
-        }
+       imp = obd->u.cli.cl_import;
+       if (!imp) {
+               CERROR("try to add conn on immature client dev\n");
+               RETURN(-EINVAL);
+       }
 
-        obd_str2uuid(&uuid, lustre_cfg_string(lcfg, 1));
-        rc = obd_add_conn(imp, &uuid, lcfg->lcfg_num);
+       obd_str2uuid(&uuid, lustre_cfg_string(lcfg, 1));
+       rc = obd_add_conn(imp, &uuid, lcfg->lcfg_num);
 
-        RETURN(rc);
+       RETURN(rc);
 }
 
-/** Remove a failover nid location.
- */
+/** Remove a failover NID location. */
 static int class_del_conn(struct obd_device *obd, struct lustre_cfg *lcfg)
 {
-        struct obd_import *imp;
-        struct obd_uuid uuid;
-        int rc;
-        ENTRY;
-
-        if (LUSTRE_CFG_BUFLEN(lcfg, 1) < 1 ||
-            LUSTRE_CFG_BUFLEN(lcfg, 1) > sizeof(struct obd_uuid)) {
-                CERROR("invalid conn_uuid\n");
-                RETURN(-EINVAL);
-        }
-        if (strcmp(obd->obd_type->typ_name, LUSTRE_MDC_NAME) &&
-            strcmp(obd->obd_type->typ_name, LUSTRE_OSC_NAME)) {
-                CERROR("can't del connection on non-client dev\n");
-                RETURN(-EINVAL);
-        }
-
-        imp = obd->u.cli.cl_import;
-        if (!imp) {
-                CERROR("try to del conn on immature client dev\n");
-                RETURN(-EINVAL);
-        }
-
-        obd_str2uuid(&uuid, lustre_cfg_string(lcfg, 1));
-        rc = obd_del_conn(imp, &uuid);
-
-        RETURN(rc);
+       struct obd_import *imp;
+       struct obd_uuid uuid;
+       int rc;
+
+       ENTRY;
+
+       if (LUSTRE_CFG_BUFLEN(lcfg, 1) < 1 ||
+           LUSTRE_CFG_BUFLEN(lcfg, 1) > sizeof(struct obd_uuid)) {
+               CERROR("invalid conn_uuid\n");
+               RETURN(-EINVAL);
+       }
+       if (strcmp(obd->obd_type->typ_name, LUSTRE_MDC_NAME) &&
+           strcmp(obd->obd_type->typ_name, LUSTRE_OSC_NAME)) {
+               CERROR("can't del connection on non-client dev\n");
+               RETURN(-EINVAL);
+       }
+
+       imp = obd->u.cli.cl_import;
+       if (!imp) {
+               CERROR("try to del conn on immature client dev\n");
+               RETURN(-EINVAL);
+       }
+
+       obd_str2uuid(&uuid, lustre_cfg_string(lcfg, 1));
+       rc = obd_del_conn(imp, &uuid);
+
+       RETURN(rc);
 }
 
 static LIST_HEAD(lustre_profile_list);
 static DEFINE_SPINLOCK(lustre_profile_list_lock);
 
-struct lustre_profile *class_get_profile(const char * prof)
+struct lustre_profile *class_get_profile(const char *prof)
 {
        struct lustre_profile *lprof;
 
@@ -888,43 +1048,45 @@ struct lustre_profile *class_get_profile(const char * prof)
 }
 EXPORT_SYMBOL(class_get_profile);
 
-/** Create a named "profile".
- * This defines the mdc and osc names to use for a client.
- * This also is used to define the lov to be used by a mdt.
+/**
+ * Create a named "profile".
+ * This defines the MDC and OSC names to use for a client.
+ * This also is used to define the LOV to be used by a MDT.
  */
 static int class_add_profile(int proflen, char *prof, int osclen, char *osc,
                             int mdclen, char *mdc)
 {
-        struct lustre_profile *lprof;
-        int err = 0;
-        ENTRY;
+       struct lustre_profile *lprof;
+       int err = 0;
+
+       ENTRY;
 
-        CDEBUG(D_CONFIG, "Add profile %s\n", prof);
+       CDEBUG(D_CONFIG, "Add profile %s\n", prof);
 
-        OBD_ALLOC(lprof, sizeof(*lprof));
-        if (lprof == NULL)
-                RETURN(-ENOMEM);
+       OBD_ALLOC(lprof, sizeof(*lprof));
+       if (!lprof)
+               RETURN(-ENOMEM);
        INIT_LIST_HEAD(&lprof->lp_list);
 
-        LASSERT(proflen == (strlen(prof) + 1));
-        OBD_ALLOC(lprof->lp_profile, proflen);
-        if (lprof->lp_profile == NULL)
-                GOTO(out, err = -ENOMEM);
-        memcpy(lprof->lp_profile, prof, proflen);
-
-        LASSERT(osclen == (strlen(osc) + 1));
-        OBD_ALLOC(lprof->lp_dt, osclen);
-        if (lprof->lp_dt == NULL)
-                GOTO(out, err = -ENOMEM);
-        memcpy(lprof->lp_dt, osc, osclen);
-
-        if (mdclen > 0) {
-                LASSERT(mdclen == (strlen(mdc) + 1));
-                OBD_ALLOC(lprof->lp_md, mdclen);
-                if (lprof->lp_md == NULL)
-                        GOTO(out, err = -ENOMEM);
-                memcpy(lprof->lp_md, mdc, mdclen);
-        }
+       LASSERT(proflen == (strlen(prof) + 1));
+       OBD_ALLOC(lprof->lp_profile, proflen);
+       if (!lprof->lp_profile)
+               GOTO(out, err = -ENOMEM);
+       memcpy(lprof->lp_profile, prof, proflen);
+
+       LASSERT(osclen == (strlen(osc) + 1));
+       OBD_ALLOC(lprof->lp_dt, osclen);
+       if (!lprof->lp_dt)
+               GOTO(out, err = -ENOMEM);
+       memcpy(lprof->lp_dt, osc, osclen);
+
+       if (mdclen > 0) {
+               LASSERT(mdclen == (strlen(mdc) + 1));
+               OBD_ALLOC(lprof->lp_md, mdclen);
+               if (!lprof->lp_md)
+                       GOTO(out, err = -ENOMEM);
+               memcpy(lprof->lp_md, mdc, mdclen);
+       }
 
        spin_lock(&lustre_profile_list_lock);
        lprof->lp_refs = 1;
@@ -932,22 +1094,23 @@ static int class_add_profile(int proflen, char *prof, int osclen, char *osc,
 
        list_add(&lprof->lp_list, &lustre_profile_list);
        spin_unlock(&lustre_profile_list_lock);
-        RETURN(err);
+       RETURN(err);
 
 out:
-        if (lprof->lp_md)
-                OBD_FREE(lprof->lp_md, mdclen);
-        if (lprof->lp_dt)
-                OBD_FREE(lprof->lp_dt, osclen);
-        if (lprof->lp_profile)
-                OBD_FREE(lprof->lp_profile, proflen);
-        OBD_FREE(lprof, sizeof(*lprof));
-        RETURN(err);
+       if (lprof->lp_md)
+               OBD_FREE(lprof->lp_md, mdclen);
+       if (lprof->lp_dt)
+               OBD_FREE(lprof->lp_dt, osclen);
+       if (lprof->lp_profile)
+               OBD_FREE(lprof->lp_profile, proflen);
+       OBD_FREE(lprof, sizeof(*lprof));
+       RETURN(err);
 }
 
 void class_del_profile(const char *prof)
 {
        struct lustre_profile *lprof;
+
        ENTRY;
 
        CDEBUG(D_CONFIG, "Del profile %s\n", prof);
@@ -980,12 +1143,14 @@ void class_put_profile(struct lustre_profile *lprof)
        /* confirm not a negative number */
        LASSERT(lprof->lp_refs == 0);
 
-       /* At least one class_del_profile/profiles must be called
-        * on the target profile or lustre_profile_list will corrupt */
+       /*
+        * At least one class_del_profile/profiles must be called
+        * on the target profile or lustre_profile_list will corrupt
+        */
        LASSERT(lprof->lp_list_deleted);
        OBD_FREE(lprof->lp_profile, strlen(lprof->lp_profile) + 1);
        OBD_FREE(lprof->lp_dt, strlen(lprof->lp_dt) + 1);
-       if (lprof->lp_md != NULL)
+       if (lprof->lp_md)
                OBD_FREE(lprof->lp_md, strlen(lprof->lp_md) + 1);
        OBD_FREE(lprof, sizeof(*lprof));
 }
@@ -1012,40 +1177,13 @@ void class_del_profiles(void)
 }
 EXPORT_SYMBOL(class_del_profiles);
 
-static int class_set_global(char *ptr, int val, struct lustre_cfg *lcfg)
-{
-       ENTRY;
-       if (class_match_param(ptr, PARAM_AT_MIN, NULL) == 0)
-               at_min = val;
-       else if (class_match_param(ptr, PARAM_AT_MAX, NULL) == 0)
-               at_max = val;
-       else if (class_match_param(ptr, PARAM_AT_EXTRA, NULL) == 0)
-               at_extra = val;
-       else if (class_match_param(ptr, PARAM_AT_EARLY_MARGIN, NULL) == 0)
-               at_early_margin = val;
-       else if (class_match_param(ptr, PARAM_AT_HISTORY, NULL) == 0)
-               at_history = val;
-       else if (class_match_param(ptr, PARAM_JOBID_VAR, NULL) == 0)
-               strlcpy(obd_jobid_var, lustre_cfg_string(lcfg, 2),
-                       JOBSTATS_JOBID_VAR_MAX_LEN + 1);
-       else
-               RETURN(-EINVAL);
-
-       CDEBUG(D_IOCTL, "global %s = %d\n", ptr, val);
-       RETURN(0);
-}
-
-
-/* We can't call ll_process_config or lquota_process_config directly because
- * it lives in a module that must be loaded after this one. */
-static int (*client_process_config)(struct lustre_cfg *lcfg) = NULL;
+/*
+ * We can't call lquota_process_config directly because
+ * it lives in a module that must be loaded after this one.
+ */
+#ifdef HAVE_SERVER_SUPPORT
 static int (*quota_process_config)(struct lustre_cfg *lcfg) = NULL;
-
-void lustre_register_client_process_config(int (*cpc)(struct lustre_cfg *lcfg))
-{
-        client_process_config = cpc;
-}
-EXPORT_SYMBOL(lustre_register_client_process_config);
+#endif /* HAVE_SERVER_SUPPORT */
 
 /**
  * Rename the proc parameter in \a cfg with a new name \a new_name.
@@ -1062,13 +1200,14 @@ EXPORT_SYMBOL(lustre_register_client_process_config);
 struct lustre_cfg *lustre_cfg_rename(struct lustre_cfg *cfg,
                                     const char *new_name)
 {
-       struct lustre_cfg_bufs  *bufs = NULL;
-       struct lustre_cfg       *new_cfg = NULL;
-       char                    *param = NULL;
-       char                    *new_param = NULL;
-       char                    *value = NULL;
-       int                      name_len = 0;
-       int                      new_len = 0;
+       struct lustre_cfg_bufs *bufs = NULL;
+       struct lustre_cfg *new_cfg = NULL;
+       char *param = NULL;
+       char *new_param = NULL;
+       char *value = NULL;
+       int name_len = 0;
+       int new_len = 0;
+
        ENTRY;
 
        if (!cfg || !new_name)
@@ -1079,10 +1218,10 @@ struct lustre_cfg *lustre_cfg_rename(struct lustre_cfg *cfg,
                GOTO(out_nocfg, new_cfg = ERR_PTR(-EINVAL));
 
        value = strchr(param, '=');
-       if (value == NULL)
-               name_len = strlen(param);
-       else
+       if (value)
                name_len = value - param;
+       else
+               name_len = strlen(param);
 
        new_len = LUSTRE_CFG_BUFLEN(cfg, 1) + strlen(new_name) - name_len;
 
@@ -1090,8 +1229,8 @@ struct lustre_cfg *lustre_cfg_rename(struct lustre_cfg *cfg,
        if (!new_param)
                GOTO(out_nocfg, new_cfg = ERR_PTR(-ENOMEM));
 
-       strcpy(new_param, new_name);
-       if (value != NULL)
+       strlcpy(new_param, new_name, new_len);
+       if (value)
                strcat(new_param, value);
 
        OBD_ALLOC_PTR(bufs);
@@ -1122,10 +1261,12 @@ out_nocfg:
 }
 EXPORT_SYMBOL(lustre_cfg_rename);
 
-static int process_param2_config(struct lustre_cfg *lcfg)
+static ssize_t process_param2_config(struct lustre_cfg *lcfg)
 {
        char *param = lustre_cfg_string(lcfg, 1);
        char *upcall = lustre_cfg_string(lcfg, 2);
+       struct kobject *kobj = NULL;
+       const char *subsys = param;
        char *argv[] = {
                [0] = "/usr/sbin/lctl",
                [1] = "set_param",
@@ -1134,8 +1275,46 @@ static int process_param2_config(struct lustre_cfg *lcfg)
        };
        ktime_t start;
        ktime_t end;
-       int             rc;
+       size_t len;
+       int rc;
+
        ENTRY;
+       print_lustre_cfg(lcfg);
+
+       len = strcspn(param, ".=");
+       if (!len)
+               return -EINVAL;
+
+       /* If we find '=' then its the top level sysfs directory */
+       if (param[len] == '=')
+               return class_set_global(param);
+
+       subsys = kstrndup(param, len, GFP_KERNEL);
+       if (!subsys)
+               return -ENOMEM;
+
+       kobj = kset_find_obj(lustre_kset, subsys);
+       kfree(subsys);
+       if (kobj) {
+               char *value = param;
+               char *envp[4];
+               int i;
+
+               param = strsep(&value, "=");
+               envp[0] = kasprintf(GFP_KERNEL, "PARAM=%s", param);
+               envp[1] = kasprintf(GFP_KERNEL, "SETTING=%s", value);
+               envp[2] = kasprintf(GFP_KERNEL, "TIME=%lld",
+                                   ktime_get_real_seconds());
+               envp[3] = NULL;
+
+               rc = kobject_uevent_env(kobj, KOBJ_CHANGE, envp);
+               for (i = 0; i < ARRAY_SIZE(envp); i++)
+                       kfree(envp[i]);
+
+               kobject_put(kobj);
+
+               RETURN(rc);
+       }
 
        /* Add upcall processing here. Now only lctl is supported */
        if (strcmp(upcall, LCTL_UPCALL) != 0) {
@@ -1161,120 +1340,166 @@ static int process_param2_config(struct lustre_cfg *lcfg)
        RETURN(rc);
 }
 
+#ifdef HAVE_SERVER_SUPPORT
 void lustre_register_quota_process_config(int (*qpc)(struct lustre_cfg *lcfg))
 {
        quota_process_config = qpc;
 }
 EXPORT_SYMBOL(lustre_register_quota_process_config);
+#endif /* HAVE_SERVER_SUPPORT */
+
+#define QMT0_DEV_NAME_LEN (LUSTRE_MAXFSNAME + sizeof("-QMT0000"))
+static struct obd_device *obd_find_qmt0(char *obd_name)
+{
+       char qmt_name[QMT0_DEV_NAME_LEN];
+       struct obd_device *qmt = NULL;
+
+       if (!server_name2fsname(obd_name, qmt_name, NULL)) {
+               strlcat(qmt_name, "-QMT0000", QMT0_DEV_NAME_LEN);
+               qmt = class_name2obd(qmt_name);
+       }
+
+       return qmt;
+}
 
-/** Process configuration commands given in lustre_cfg form.
+/**
+ * Process configuration commands given in lustre_cfg form.
  * These may come from direct calls (e.g. class_manual_cleanup)
  * or processing the config llog, or ioctl from lctl.
  */
 int class_process_config(struct lustre_cfg *lcfg)
 {
-        struct obd_device *obd;
-        int err;
-
-        LASSERT(lcfg && !IS_ERR(lcfg));
-        CDEBUG(D_IOCTL, "processing cmd: %x\n", lcfg->lcfg_command);
-
-        /* Commands that don't need a device */
-        switch(lcfg->lcfg_command) {
-        case LCFG_ATTACH: {
-                err = class_attach(lcfg);
-                GOTO(out, err);
-        }
-        case LCFG_ADD_UUID: {
-               CDEBUG(D_IOCTL, "adding mapping from uuid %s to nid %#llx"
-                       " (%s)\n", lustre_cfg_string(lcfg, 1),
-                       lcfg->lcfg_nid, libcfs_nid2str(lcfg->lcfg_nid));
-
-                err = class_add_uuid(lustre_cfg_string(lcfg, 1), lcfg->lcfg_nid);
-                GOTO(out, err);
-        }
-        case LCFG_DEL_UUID: {
-                CDEBUG(D_IOCTL, "removing mappings for uuid %s\n",
-                       (lcfg->lcfg_bufcount < 2 || LUSTRE_CFG_BUFLEN(lcfg, 1) == 0)
-                       ? "<all uuids>" : lustre_cfg_string(lcfg, 1));
-
-                err = class_del_uuid(lustre_cfg_string(lcfg, 1));
-                GOTO(out, err);
-        }
-        case LCFG_MOUNTOPT: {
-                CDEBUG(D_IOCTL, "mountopt: profile %s osc %s mdc %s\n",
-                       lustre_cfg_string(lcfg, 1),
-                       lustre_cfg_string(lcfg, 2),
-                       lustre_cfg_string(lcfg, 3));
-                /* set these mount options somewhere, so ll_fill_super
-                 * can find them. */
-                err = class_add_profile(LUSTRE_CFG_BUFLEN(lcfg, 1),
-                                        lustre_cfg_string(lcfg, 1),
-                                        LUSTRE_CFG_BUFLEN(lcfg, 2),
-                                        lustre_cfg_string(lcfg, 2),
-                                        LUSTRE_CFG_BUFLEN(lcfg, 3),
-                                        lustre_cfg_string(lcfg, 3));
-                GOTO(out, err);
-        }
-        case LCFG_DEL_MOUNTOPT: {
-                CDEBUG(D_IOCTL, "mountopt: profile %s\n",
-                       lustre_cfg_string(lcfg, 1));
-                class_del_profile(lustre_cfg_string(lcfg, 1));
-                GOTO(out, err = 0);
-        }
-        case LCFG_SET_TIMEOUT: {
-                CDEBUG(D_IOCTL, "changing lustre timeout from %d to %d\n",
-                       obd_timeout, lcfg->lcfg_num);
-                obd_timeout = max(lcfg->lcfg_num, 1U);
+       struct obd_device *obd;
+       int err;
+
+       LASSERT(lcfg && !IS_ERR(lcfg));
+       CDEBUG(D_IOCTL, "processing cmd: %x\n", lcfg->lcfg_command);
+
+       /* Commands that don't need a device */
+       switch (lcfg->lcfg_command) {
+       case LCFG_ATTACH: {
+               err = class_attach(lcfg);
+               GOTO(out, err);
+       }
+       case LCFG_ADD_UUID: {
+               CDEBUG(D_IOCTL,
+                      "adding mapping from uuid %s to nid %#llx (%s)\n",
+                      lustre_cfg_string(lcfg, 1), lcfg->lcfg_nid,
+                      libcfs_nid2str(lcfg->lcfg_nid));
+
+               err = class_add_uuid(lustre_cfg_string(lcfg, 1),
+                                    lcfg->lcfg_nid);
+               GOTO(out, err);
+       }
+       case LCFG_DEL_UUID: {
+               CDEBUG(D_IOCTL, "removing mappings for uuid %s\n",
+                      (lcfg->lcfg_bufcount < 2 || LUSTRE_CFG_BUFLEN(lcfg, 1) ==
+                       0) ? "<all uuids>" : lustre_cfg_string(lcfg, 1));
+
+               err = class_del_uuid(lustre_cfg_string(lcfg, 1));
+               GOTO(out, err);
+       }
+       case LCFG_MOUNTOPT: {
+               CDEBUG(D_IOCTL, "mountopt: profile %s osc %s mdc %s\n",
+                      lustre_cfg_string(lcfg, 1),
+                      lustre_cfg_string(lcfg, 2),
+                      lustre_cfg_string(lcfg, 3));
+               /*
+                * set these mount options somewhere, so ll_fill_super
+                * can find them.
+                */
+               err = class_add_profile(LUSTRE_CFG_BUFLEN(lcfg, 1),
+                                       lustre_cfg_string(lcfg, 1),
+                                       LUSTRE_CFG_BUFLEN(lcfg, 2),
+                                       lustre_cfg_string(lcfg, 2),
+                                       LUSTRE_CFG_BUFLEN(lcfg, 3),
+                                       lustre_cfg_string(lcfg, 3));
+               GOTO(out, err);
+       }
+       case LCFG_DEL_MOUNTOPT: {
+               CDEBUG(D_IOCTL, "mountopt: profile %s\n",
+                      lustre_cfg_string(lcfg, 1));
+               class_del_profile(lustre_cfg_string(lcfg, 1));
+               GOTO(out, err = 0);
+       }
+       case LCFG_SET_TIMEOUT: {
+               CDEBUG(D_IOCTL, "changing lustre timeout from %d to %d\n",
+                      obd_timeout, lcfg->lcfg_num);
+               obd_timeout = max(lcfg->lcfg_num, 1U);
                obd_timeout_set = 1;
-                GOTO(out, err = 0);
-        }
-        case LCFG_SET_LDLM_TIMEOUT: {
-                CDEBUG(D_IOCTL, "changing lustre ldlm_timeout from %d to %d\n",
-                       ldlm_timeout, lcfg->lcfg_num);
-                ldlm_timeout = max(lcfg->lcfg_num, 1U);
-                if (ldlm_timeout >= obd_timeout)
-                        ldlm_timeout = max(obd_timeout / 3, 1U);
+               GOTO(out, err = 0);
+       }
+       case LCFG_SET_LDLM_TIMEOUT: {
+               CDEBUG(D_IOCTL, "changing lustre ldlm_timeout from %d to %d\n",
+                      ldlm_timeout, lcfg->lcfg_num);
+               ldlm_timeout = max(lcfg->lcfg_num, 1U);
+               if (ldlm_timeout >= obd_timeout)
+                       ldlm_timeout = max(obd_timeout / 3, 1U);
                ldlm_timeout_set = 1;
-                GOTO(out, err = 0);
-        }
-        case LCFG_SET_UPCALL: {
-                LCONSOLE_ERROR_MSG(0x15a, "recovery upcall is deprecated\n");
-                /* COMPAT_146 Don't fail on old configs */
-                GOTO(out, err = 0);
-        }
-        case LCFG_MARKER: {
-                struct cfg_marker *marker;
-                marker = lustre_cfg_buf(lcfg, 1);
-                CDEBUG(D_IOCTL, "marker %d (%#x) %.16s %s\n", marker->cm_step,
-                       marker->cm_flags, marker->cm_tgtname, marker->cm_comment);
-                GOTO(out, err = 0);
-        }
-        case LCFG_PARAM: {
-                char *tmp;
-                /* llite has no obd */
-                if ((class_match_param(lustre_cfg_string(lcfg, 1),
-                                      PARAM_LLITE, NULL) == 0) &&
-                    client_process_config) {
-                        err = (*client_process_config)(lcfg);
-                        GOTO(out, err);
-                } else if ((class_match_param(lustre_cfg_string(lcfg, 1),
-                                              PARAM_SYS, &tmp) == 0)) {
-                        /* Global param settings */
-                       err = class_set_global(tmp, lcfg->lcfg_num, lcfg);
+               GOTO(out, err = 0);
+       }
+       case LCFG_SET_UPCALL: {
+               LCONSOLE_ERROR_MSG(0x15a, "recovery upcall is deprecated\n");
+               /* COMPAT_146 Don't fail on old configs */
+               GOTO(out, err = 0);
+       }
+       case LCFG_MARKER: {
+               struct cfg_marker *marker;
+
+               marker = lustre_cfg_buf(lcfg, 1);
+               CDEBUG(D_IOCTL, "marker %d (%#x) %.16s %s\n", marker->cm_step,
+                      marker->cm_flags, marker->cm_tgtname,
+                      marker->cm_comment);
+               GOTO(out, err = 0);
+       }
+       case LCFG_PARAM: {
+               char *tmp;
+
+               /* llite has no OBD */
+               if (class_match_param(lustre_cfg_string(lcfg, 1),
+                                     PARAM_LLITE, NULL) == 0) {
+                       struct lustre_sb_info *lsi;
+                       unsigned long addr;
+                       ssize_t count;
+
+                       /*
+                        * The instance name contains the sb:
+                        * lustre-client-aacfe000
+                        */
+                       tmp = strrchr(lustre_cfg_string(lcfg, 0), '-');
+                       if (!tmp || !*(++tmp))
+                               GOTO(out, err = -EINVAL);
+
+                       if (sscanf(tmp, "%lx", &addr) != 1)
+                               GOTO(out, err = -EINVAL);
+
+                       lsi = s2lsi((struct super_block *)addr);
+                       /* This better be a real Lustre superblock! */
+                       LASSERT(lsi->lsi_lmd->lmd_magic == LMD_MAGIC);
+
+                       count = class_modify_config(lcfg, PARAM_LLITE,
+                                                   lsi->lsi_kobj);
+                       err = count < 0 ? count : 0;
+                       GOTO(out, err);
+               } else if ((class_match_param(lustre_cfg_string(lcfg, 1),
+                                             PARAM_SYS, &tmp) == 0)) {
+                       /* Global param settings */
+                       err = class_set_global(tmp);
                        /*
                         * Client or server should not fail to mount if
                         * it hits an unknown configuration parameter.
                         */
-                       if (err != 0)
+                       if (err < 0)
                                CWARN("Ignoring unknown param %s\n", tmp);
 
                        GOTO(out, err = 0);
+#ifdef HAVE_SERVER_SUPPORT
                } else if ((class_match_param(lustre_cfg_string(lcfg, 1),
                                              PARAM_QUOTA, &tmp) == 0) &&
                           quota_process_config) {
                        err = (*quota_process_config)(lcfg);
                        GOTO(out, err);
+#endif /* HAVE_SERVER_SUPPORT */
                }
 
                break;
@@ -1284,165 +1509,227 @@ int class_process_config(struct lustre_cfg *lcfg)
                GOTO(out, err = 0);
        }
        }
-        /* Commands that require a device */
-        obd = class_name2obd(lustre_cfg_string(lcfg, 0));
-        if (obd == NULL) {
-                if (!LUSTRE_CFG_BUFLEN(lcfg, 0))
-                        CERROR("this lcfg command requires a device name\n");
-                else
-                        CERROR("no device for: %s\n",
-                               lustre_cfg_string(lcfg, 0));
-
-                GOTO(out, err = -EINVAL);
-        }
-
+       /* Commands that require a device */
+       obd = class_name2obd(lustre_cfg_string(lcfg, 0));
+       if (!obd) {
+               if (!LUSTRE_CFG_BUFLEN(lcfg, 0))
+                       CERROR("this lcfg command requires a device name\n");
+               else
+                       CERROR("no device for: %s\n",
+                              lustre_cfg_string(lcfg, 0));
+
+               GOTO(out, err = -EINVAL);
+       }
        switch(lcfg->lcfg_command) {
        case LCFG_SETUP: {
                err = class_setup(obd, lcfg);
                GOTO(out, err);
        }
-        case LCFG_DETACH: {
-                err = class_detach(obd, lcfg);
-                GOTO(out, err = 0);
-        }
-        case LCFG_CLEANUP: {
-                err = class_cleanup(obd, lcfg);
-                GOTO(out, err = 0);
-        }
-        case LCFG_ADD_CONN: {
-                err = class_add_conn(obd, lcfg);
-                GOTO(out, err = 0);
-        }
-        case LCFG_DEL_CONN: {
-                err = class_del_conn(obd, lcfg);
-                GOTO(out, err = 0);
-        }
-        case LCFG_POOL_NEW: {
-                err = obd_pool_new(obd, lustre_cfg_string(lcfg, 2));
-                GOTO(out, err = 0);
-        }
-        case LCFG_POOL_ADD: {
-                err = obd_pool_add(obd, lustre_cfg_string(lcfg, 2),
+       case LCFG_DETACH: {
+               err = class_detach(obd, lcfg);
+               GOTO(out, err = 0);
+       }
+       case LCFG_CLEANUP: {
+               err = class_cleanup(obd, lcfg);
+               GOTO(out, err = 0);
+       }
+       case LCFG_ADD_CONN: {
+               err = class_add_conn(obd, lcfg);
+               GOTO(out, err = 0);
+       }
+       case LCFG_DEL_CONN: {
+               err = class_del_conn(obd, lcfg);
+               GOTO(out, err = 0);
+       }
+       case LCFG_POOL_NEW: {
+               err = obd_pool_new(obd, lustre_cfg_string(lcfg, 2));
+               if (!err && !strcmp(obd->obd_type->typ_name, LUSTRE_LOD_NAME)) {
+                       obd = obd_find_qmt0(obd->obd_name);
+                       if (obd)
+                               obd_pool_new(obd, lustre_cfg_string(lcfg, 2));
+               }
+               GOTO(out, err = 0);
+       }
+       case LCFG_POOL_ADD: {
+               err = obd_pool_add(obd, lustre_cfg_string(lcfg, 2),
                                    lustre_cfg_string(lcfg, 3));
-                GOTO(out, err = 0);
-        }
-        case LCFG_POOL_REM: {
-                err = obd_pool_rem(obd, lustre_cfg_string(lcfg, 2),
+               if (!err && !strcmp(obd->obd_type->typ_name, LUSTRE_LOD_NAME)) {
+                       obd = obd_find_qmt0(obd->obd_name);
+                       if (obd)
+                               obd_pool_add(obd, lustre_cfg_string(lcfg, 2),
+                                            lustre_cfg_string(lcfg, 3));
+               }
+               GOTO(out, err = 0);
+       }
+       case LCFG_POOL_REM: {
+               err = obd_pool_rem(obd, lustre_cfg_string(lcfg, 2),
                                    lustre_cfg_string(lcfg, 3));
-                GOTO(out, err = 0);
-        }
-        case LCFG_POOL_DEL: {
-                err = obd_pool_del(obd, lustre_cfg_string(lcfg, 2));
-                GOTO(out, err = 0);
-        }
-        default: {
-                err = obd_process_config(obd, sizeof(*lcfg), lcfg);
-                GOTO(out, err);
-
-        }
-        }
+               if (!err && !strcmp(obd->obd_type->typ_name, LUSTRE_LOD_NAME)) {
+                       obd = obd_find_qmt0(obd->obd_name);
+                       if (obd)
+                               obd_pool_rem(obd, lustre_cfg_string(lcfg, 2),
+                                            lustre_cfg_string(lcfg, 3));
+               }
+               GOTO(out, err = 0);
+       }
+       case LCFG_POOL_DEL: {
+               err = obd_pool_del(obd, lustre_cfg_string(lcfg, 2));
+               if (!err && !strcmp(obd->obd_type->typ_name, LUSTRE_LOD_NAME)) {
+                       obd = obd_find_qmt0(obd->obd_name);
+                       if (obd)
+                               obd_pool_del(obd, lustre_cfg_string(lcfg, 2));
+               }
+               GOTO(out, err = 0);
+       }
+       /*
+        * Process config log ADD_MDC record twice to add MDC also to LOV
+        * for Data-on-MDT:
+        *
+        * add 0:lustre-clilmv 1:lustre-MDT0000_UUID 2:0 3:1
+        *     4:lustre-MDT0000-mdc_UUID
+        */
+       case LCFG_ADD_MDC: {
+               struct obd_device *lov_obd;
+               char *clilmv;
+
+               err = obd_process_config(obd, sizeof(*lcfg), lcfg);
+               if (err)
+                       GOTO(out, err);
+
+               /* make sure this is client LMV log entry */
+               clilmv = strstr(lustre_cfg_string(lcfg, 0), "clilmv");
+               if (!clilmv)
+                       GOTO(out, err);
+
+               /*
+                * replace 'lmv' with 'lov' name to address LOV device and
+                * process llog record to add MDC there.
+                */
+               clilmv[4] = 'o';
+               lov_obd = class_name2obd(lustre_cfg_string(lcfg, 0));
+               if (lov_obd) {
+                       err = obd_process_config(lov_obd, sizeof(*lcfg), lcfg);
+               } else {
+                       err = -ENOENT;
+                       CERROR("%s: Cannot find LOV by %s name, rc = %d\n",
+                              obd->obd_name, lustre_cfg_string(lcfg, 0), err);
+               }
+               /* restore 'lmv' name */
+               clilmv[4] = 'm';
+               GOTO(out, err);
+       }
+       default: {
+               err = obd_process_config(obd, sizeof(*lcfg), lcfg);
+               GOTO(out, err);
+       }
+       }
+       EXIT;
 out:
-        if ((err < 0) && !(lcfg->lcfg_command & LCFG_REQUIRED)) {
-                CWARN("Ignoring error %d on optional command %#x\n", err,
-                      lcfg->lcfg_command);
-                err = 0;
-        }
-        return err;
+       if ((err < 0) && !(lcfg->lcfg_command & LCFG_REQUIRED)) {
+               CWARN("Ignoring error %d on optional command %#x\n", err,
+                     lcfg->lcfg_command);
+               err = 0;
+       }
+       return err;
 }
 EXPORT_SYMBOL(class_process_config);
 
-int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars,
-                            struct lustre_cfg *lcfg, void *data)
+ssize_t class_modify_config(struct lustre_cfg *lcfg, const char *prefix,
+                           struct kobject *kobj)
 {
-       struct lprocfs_vars *var;
-       struct file fakefile;
-       struct seq_file fake_seqfile;
-       char *key, *sval;
-       int i, keylen, vallen;
-       int matched = 0, j = 0;
-       int rc = 0;
-       int skip = 0;
-       ENTRY;
+       struct kobj_type *typ;
+       ssize_t count = 0;
+       int i;
 
        if (lcfg->lcfg_command != LCFG_PARAM) {
                CERROR("Unknown command: %d\n", lcfg->lcfg_command);
-               RETURN(-EINVAL);
+               return -EINVAL;
        }
 
-       /* fake a seq file so that var->fops->write can work... */
-       fakefile.private_data = &fake_seqfile;
-       fake_seqfile.private = data;
-       /* e.g. tunefs.lustre --param mdt.group_upcall=foo /r/tmp/lustre-mdt
-          or   lctl conf_param lustre-MDT0000.mdt.group_upcall=bar
-          or   lctl conf_param lustre-OST0000.osc.max_dirty_mb=36 */
+       typ = get_ktype(kobj);
+       if (!typ || !typ->default_attrs)
+               return -ENODEV;
+
+       print_lustre_cfg(lcfg);
+
+       /*
+        * e.g. tunefs.lustre --param mdt.group_upcall=foo /r/tmp/lustre-mdt
+        * or   lctl conf_param lustre-MDT0000.mdt.group_upcall=bar
+        * or   lctl conf_param lustre-OST0000.osc.max_dirty_mb=36
+        */
        for (i = 1; i < lcfg->lcfg_bufcount; i++) {
+               struct attribute *attr;
+               size_t keylen;
+               char *value;
+               char *key;
+               int j;
+
                key = lustre_cfg_buf(lcfg, i);
                /* Strip off prefix */
                if (class_match_param(key, prefix, &key))
-                       /* If the prefix doesn't match, return error so we
-                        * can pass it down the stack */
-                       RETURN(-ENOSYS);
-               sval = strchr(key, '=');
-               if (!sval || *(sval + 1) == 0) {
+                       /*
+                        * If the prefix doesn't match, return error so we
+                        * can pass it down the stack
+                        */
+                       return -EINVAL;
+
+               value = strchr(key, '=');
+               if (!value || *(value + 1) == 0) {
                        CERROR("%s: can't parse param '%s' (missing '=')\n",
                               lustre_cfg_string(lcfg, 0),
                               lustre_cfg_string(lcfg, i));
-                       /* rc = -EINVAL;        continue parsing other params */
+                       /* continue parsing other params */
                        continue;
                }
-               keylen = sval - key;
-               sval++;
-               vallen = strlen(sval);
-               matched = 0;
-               j = 0;
-               /* Search proc entries */
-               while (lvars[j].name) {
-                       var = &lvars[j];
-                       if (class_match_param(key, var->name, NULL) == 0 &&
-                           keylen == strlen(var->name)) {
-                               matched++;
-                               rc = -EROFS;
-
-                               if (var->fops && var->fops->write) {
-                                       mm_segment_t oldfs;
-                                       oldfs = get_fs();
-                                       set_fs(KERNEL_DS);
-                                       rc = (var->fops->write)(&fakefile, sval,
-                                                               vallen, NULL);
-                                       set_fs(oldfs);
-                               }
+               keylen = value - key;
+               value++;
+
+               attr = NULL;
+               for (j = 0; typ->default_attrs[j]; j++) {
+                       if (!strncmp(typ->default_attrs[j]->name, key,
+                                    keylen)) {
+                               attr = typ->default_attrs[j];
                                break;
                        }
-                       j++;
                }
-               if (!matched) {
-                       /* It was upgraded from old MDT/OST device,
-                        * ignore the obsolete "sec_level" parameter. */
-                       if (strncmp("sec_level", key, keylen) == 0)
-                               continue;
 
-                       CERROR("%s: unknown config parameter '%s'\n",
-                              lustre_cfg_string(lcfg, 0),
-                              lustre_cfg_string(lcfg, i));
-                       /* rc = -EINVAL;        continue parsing other params */
-                       skip++;
-               } else if (rc < 0) {
-                       CERROR("%s: error writing proc '%s'='%s': rc = %d\n",
-                              lustre_cfg_string(lcfg, 0), key, sval, rc);
-                       rc = 0;
+               if (!attr) {
+                       char *envp[4], *param, *path;
+
+                       path = kobject_get_path(kobj, GFP_KERNEL);
+                       if (!path)
+                               return -EINVAL;
+
+                       /* convert sysfs path to uevent format */
+                       param = path;
+                       while ((param = strchr(param, '/')) != NULL)
+                               *param = '.';
+
+                       param = strstr(path, "fs.lustre.") + 10;
+
+                       envp[0] = kasprintf(GFP_KERNEL, "PARAM=%s.%.*s",
+                                           param, (int) keylen, key);
+                       envp[1] = kasprintf(GFP_KERNEL, "SETTING=%s", value);
+                       envp[2] = kasprintf(GFP_KERNEL, "TIME=%lld",
+                                           ktime_get_real_seconds());
+                       envp[3] = NULL;
+
+                       if (kobject_uevent_env(kobj, KOBJ_CHANGE, envp)) {
+                               CERROR("%s: failed to send uevent %s\n",
+                                      kobject_name(kobj), key);
+                       }
+
+                       for (i = 0; i < ARRAY_SIZE(envp); i++)
+                               kfree(envp[i]);
+                       kfree(path);
                } else {
-                       CDEBUG(D_CONFIG, "%s: Set parameter '%s'='%s'\n",
-                              lustre_cfg_string(lcfg, 0), key, sval);
+                       count += lustre_attr_store(kobj, attr, value,
+                                                  strlen(value));
                }
        }
-
-       if (rc > 0)
-               rc = 0;
-       if (!rc && skip)
-               rc = skip;
-       RETURN(rc);
+       return count;
 }
-EXPORT_SYMBOL(class_process_proc_param);
+EXPORT_SYMBOL(class_modify_config);
 
 /*
  * Supplemental functions for config logs, it allocates lustre_cfg
@@ -1450,8 +1737,8 @@ EXPORT_SYMBOL(class_process_proc_param);
  */
 struct llog_cfg_rec *lustre_cfg_rec_new(int cmd, struct lustre_cfg_bufs *bufs)
 {
-       struct llog_cfg_rec     *lcr;
-       int                      reclen;
+       struct llog_cfg_rec *lcr;
+       int reclen;
 
        ENTRY;
 
@@ -1460,7 +1747,7 @@ struct llog_cfg_rec *lustre_cfg_rec_new(int cmd, struct lustre_cfg_bufs *bufs)
                 sizeof(struct llog_rec_tail);
 
        OBD_ALLOC(lcr, reclen);
-       if (lcr == NULL)
+       if (!lcr)
                RETURN(NULL);
 
        lustre_cfg_init(&lcr->lcr_cfg, cmd, bufs);
@@ -1480,7 +1767,8 @@ void lustre_cfg_rec_free(struct llog_cfg_rec *lcr)
 }
 EXPORT_SYMBOL(lustre_cfg_rec_free);
 
-/** Parse a configuration llog, doing various manipulations on them
+/**
+ * Parse a configuration llog, doing various manipulations on them
  * for various reasons, (modifications for compatibility, skip obsolete
  * records, change uuids, etc), then class_process_config() resulting
  * net records.
@@ -1515,7 +1803,7 @@ int class_config_llog_handler(const struct lu_env *env,
                if (rc)
                        GOTO(out, rc);
 
-                /* Figure out config state info */
+               /* Figure out config state info */
                if (lcfg->lcfg_command == LCFG_MARKER) {
                        struct cfg_marker *marker = lustre_cfg_buf(lcfg, 1);
                        lustre_swab_cfg_marker(marker, swab,
@@ -1523,7 +1811,7 @@ int class_config_llog_handler(const struct lu_env *env,
                        CDEBUG(D_CONFIG, "Marker, inst_flg=%#x mark_flg=%#x\n",
                               cfg->cfg_flags, marker->cm_flags);
                        if (marker->cm_flags & CM_START) {
-                                /* all previous flags off */
+                               /* all previous flags off */
                                cfg->cfg_flags = CFG_F_MARKER;
                                server_name2index(marker->cm_tgtname,
                                                  &cfg->cfg_lwp_idx, NULL);
@@ -1543,13 +1831,13 @@ int class_config_llog_handler(const struct lu_env *env,
                                cfg->cfg_flags = 0;
                        }
                }
-               /* A config command without a start marker before it is
-                  illegal (post 146) */
-               if (!(cfg->cfg_flags & CFG_F_COMPAT146) &&
-                   !(cfg->cfg_flags & CFG_F_MARKER) &&
+               /*
+                * A config command without a start marker before it is
+                * illegal
+                */
+               if (!(cfg->cfg_flags & CFG_F_MARKER) &&
                    (lcfg->lcfg_command != LCFG_MARKER)) {
-                       CWARN("Config not inside markers, ignoring! "
-                             "(inst: %p, uuid: %s, flags: %#x)\n",
+                       CWARN("Skip config outside markers, (inst: %016lx, uuid: %s, flags: %#x)\n",
                                cfg->cfg_instance,
                                cfg->cfg_uuid.uuid, cfg->cfg_flags);
                        cfg->cfg_flags |= CFG_F_SKIP;
@@ -1562,10 +1850,10 @@ int class_config_llog_handler(const struct lu_env *env,
                        break;
                }
 
-                /*
-                 * For interoperability between 1.8 and 2.0,
-                 * rename "mds" obd device type to "mdt".
-                 */
+               /*
+                * For interoperability between 1.8 and 2.0,
+                * rename "mds" OBD device type to "mdt".
+                */
                {
                        char *typename = lustre_cfg_string(lcfg, 1);
                        char *index = lustre_cfg_string(lcfg, 2);
@@ -1587,21 +1875,22 @@ int class_config_llog_handler(const struct lu_env *env,
 
 #ifdef HAVE_SERVER_SUPPORT
                /* newer MDS replaces LOV/OSC with LOD/OSP */
-               {
+               if ((lcfg->lcfg_command == LCFG_ATTACH ||
+                    lcfg->lcfg_command == LCFG_SET_PARAM ||
+                    lcfg->lcfg_command == LCFG_PARAM) &&
+                   cfg->cfg_sb && IS_MDT(s2lsi(cfg->cfg_sb))) {
                        char *typename = lustre_cfg_string(lcfg, 1);
 
-                       if ((lcfg->lcfg_command == LCFG_ATTACH && typename &&
-                           strcmp(typename, LUSTRE_LOV_NAME) == 0) &&
-                           cfg->cfg_sb && IS_MDT(s2lsi(cfg->cfg_sb))) {
+                       if (typename &&
+                           strcmp(typename, LUSTRE_LOV_NAME) == 0) {
                                CDEBUG(D_CONFIG,
                                       "For 2.x interoperability, rename obd "
                                       "type from lov to lod (%s)\n",
                                       s2lsi(cfg->cfg_sb)->lsi_svname);
                                strcpy(typename, LUSTRE_LOD_NAME);
                        }
-                       if ((lcfg->lcfg_command == LCFG_ATTACH && typename &&
-                           strcmp(typename, LUSTRE_OSC_NAME) == 0) &&
-                           cfg->cfg_sb && IS_MDT(s2lsi(cfg->cfg_sb))) {
+                       if (typename &&
+                           strcmp(typename, LUSTRE_OSC_NAME) == 0) {
                                CDEBUG(D_CONFIG,
                                       "For 2.x interoperability, rename obd "
                                       "type from osc to osp (%s)\n",
@@ -1623,13 +1912,14 @@ int class_config_llog_handler(const struct lu_env *env,
                lustre_cfg_bufs_init(&bufs, lcfg);
 
                if (cfg->cfg_instance &&
+                   lcfg->lcfg_command != LCFG_SPTLRPC_CONF &&
                    LUSTRE_CFG_BUFLEN(lcfg, 0) > 0) {
                        inst_len = LUSTRE_CFG_BUFLEN(lcfg, 0) +
-                                  sizeof(cfg->cfg_instance) * 2 + 4;
+                               LUSTRE_MAXINSTANCE + 4;
                        OBD_ALLOC(inst_name, inst_len);
-                       if (inst_name == NULL)
+                       if (!inst_name)
                                GOTO(out, rc = -ENOMEM);
-                       snprintf(inst_name, inst_len, "%s-%p",
+                       snprintf(inst_name, inst_len, "%s-%016lx",
                                lustre_cfg_string(lcfg, 0),
                                cfg->cfg_instance);
                        lustre_cfg_bufs_set_string(&bufs, 0, inst_name);
@@ -1637,31 +1927,33 @@ int class_config_llog_handler(const struct lu_env *env,
                               lcfg->lcfg_command, inst_name);
                }
 
-                /* we override the llog's uuid for clients, to insure they
-                are unique */
-               if (cfg->cfg_instance != NULL &&
-                   lcfg->lcfg_command == LCFG_ATTACH) {
+               /* override llog UUID for clients, to insure they are unique */
+               if (cfg->cfg_instance && lcfg->lcfg_command == LCFG_ATTACH)
                        lustre_cfg_bufs_set_string(&bufs, 2,
                                                   cfg->cfg_uuid.uuid);
-               }
-                /*
-                 * sptlrpc config record, we expect 2 data segments:
-                 *  [0]: fs_name/target_name,
-                 *  [1]: rule string
-                 * moving them to index [1] and [2], and insert MGC's
-                 * obdname at index [0].
-                 */
-               if (cfg->cfg_instance == NULL &&
+               /*
+                * sptlrpc config record, we expect 2 data segments:
+                *  [0]: fs_name/target_name,
+                *  [1]: rule string
+                * moving them to index [1] and [2], and insert MGC's
+                * obdname at index [0].
+                */
+               if (cfg->cfg_instance &&
                    lcfg->lcfg_command == LCFG_SPTLRPC_CONF) {
+                       /* After ASLR changes cfg_instance this needs fixing */
+                       /* "obd" is set in config_log_find_or_add() */
+                       struct obd_device *obd = (void *)cfg->cfg_instance;
+
                        lustre_cfg_bufs_set(&bufs, 2, bufs.lcfg_buf[1],
                                            bufs.lcfg_buflen[1]);
                        lustre_cfg_bufs_set(&bufs, 1, bufs.lcfg_buf[0],
                                            bufs.lcfg_buflen[0]);
                        lustre_cfg_bufs_set_string(&bufs, 0,
-                                                  cfg->cfg_obdname);
+                                                  obd->obd_name);
                }
 
-               /* Add net info to setup command
+               /*
+                * Add net info to setup command
                 * if given on command line.
                 * So config log will be:
                 * [0]: client name
@@ -1684,8 +1976,10 @@ int class_config_llog_handler(const struct lu_env *env,
                        }
                }
 
-               /* Skip add_conn command if uuid is
-                * not on restricted net */
+               /*
+                * Skip add_conn command if uuid is
+                * not on restricted net
+                */
                if (cfg && cfg->cfg_sb && s2lsi(cfg->cfg_sb) &&
                    !IS_SERVER(s2lsi(cfg->cfg_sb))) {
                        struct lustre_sb_info *lsi = s2lsi(cfg->cfg_sb);
@@ -1712,8 +2006,10 @@ int class_config_llog_handler(const struct lu_env *env,
                lcfg_new->lcfg_num   = lcfg->lcfg_num;
                lcfg_new->lcfg_flags = lcfg->lcfg_flags;
 
-               /* XXX Hack to try to remain binary compatible with
-                * pre-newconfig logs */
+               /*
+                * XXX Hack to try to remain binary compatible with
+                * pre-newconfig logs
+                */
                if (lcfg->lcfg_nal != 0 &&      /* pre-newconfig log? */
                    (lcfg->lcfg_nid >> 32) == 0) {
                        __u32 addr = (__u32)(lcfg->lcfg_nid & 0xffffffff);
@@ -1791,58 +2087,10 @@ int class_config_parse_llog(const struct lu_env *env, struct llog_ctxt *ctxt,
 
 parse_out:
        llog_close(env, llh);
-        RETURN(rc);
+       RETURN(rc);
 }
 EXPORT_SYMBOL(class_config_parse_llog);
 
-static struct lcfg_type_data {
-       __u32    ltd_type;
-       char    *ltd_name;
-       char    *ltd_bufs[4];
-} lcfg_data_table[] = {
-       { LCFG_ATTACH, "attach", { "type", "UUID", "3", "4" } },
-       { LCFG_DETACH, "detach", { "1", "2", "3", "4" } },
-       { LCFG_SETUP, "setup", { "UUID", "node", "options", "failout" } },
-       { LCFG_CLEANUP, "cleanup", { "1", "2", "3", "4" } },
-       { LCFG_ADD_UUID, "add_uuid", { "node", "2", "3", "4" }  },
-       { LCFG_DEL_UUID, "del_uuid", { "1", "2", "3", "4" }  },
-       { LCFG_MOUNTOPT, "new_profile", { "name", "lov", "lmv", "4" }  },
-       { LCFG_DEL_MOUNTOPT, "del_mountopt", { "1", "2", "3", "4" } , },
-       { LCFG_SET_TIMEOUT, "set_timeout", { "parameter", "2", "3", "4" }  },
-       { LCFG_SET_UPCALL, "set_upcall", { "1", "2", "3", "4" }  },
-       { LCFG_ADD_CONN, "add_conn", { "node", "2", "3", "4" }  },
-       { LCFG_DEL_CONN, "del_conn", { "1", "2", "3", "4" }  },
-       { LCFG_LOV_ADD_OBD, "add_osc", { "ost", "index", "gen", "UUID" } },
-       { LCFG_LOV_DEL_OBD, "del_osc", { "1", "2", "3", "4" } },
-       { LCFG_PARAM, "set_param", { "parameter", "value", "3", "4" } },
-       { LCFG_MARKER, "marker", { "1", "2", "3", "4" } },
-       { LCFG_LOG_START, "log_start", { "1", "2", "3", "4" } },
-       { LCFG_LOG_END, "log_end", { "1", "2", "3", "4" } },
-       { LCFG_LOV_ADD_INA, "add_osc_inactive", { "1", "2", "3", "4" }  },
-       { LCFG_ADD_MDC, "add_mdc", { "mdt", "index", "gen", "UUID" } },
-       { LCFG_DEL_MDC, "del_mdc", { "1", "2", "3", "4" } },
-       { LCFG_SPTLRPC_CONF, "security", { "parameter", "2", "3", "4" } },
-       { LCFG_POOL_NEW, "new_pool", { "fsname", "pool", "3", "4" }  },
-       { LCFG_POOL_ADD, "add_pool", { "fsname", "pool", "ost", "4" } },
-       { LCFG_POOL_REM, "remove_pool", { "fsname", "pool", "ost", "4" } },
-       { LCFG_POOL_DEL, "del_pool", { "fsname", "pool", "3", "4" } },
-       { LCFG_SET_LDLM_TIMEOUT, "set_ldlm_timeout",
-         { "parameter", "2", "3", "4" } },
-       { 0, NULL, { NULL, NULL, NULL, NULL } }
-};
-
-static struct lcfg_type_data *lcfg_cmd2data(__u32 cmd)
-{
-       int i = 0;
-
-       while (lcfg_data_table[i].ltd_type != 0) {
-               if (lcfg_data_table[i].ltd_type == cmd)
-                       return &lcfg_data_table[i];
-               i++;
-       }
-       return NULL;
-}
-
 /**
  * Parse config record and output dump in supplied buffer.
  *
@@ -1855,11 +2103,11 @@ static struct lcfg_type_data *lcfg_cmd2data(__u32 cmd)
  */
 int class_config_yaml_output(struct llog_rec_hdr *rec, char *buf, int size)
 {
-       struct lustre_cfg       *lcfg = (struct lustre_cfg *)(rec + 1);
-       char                    *ptr = buf;
-       char                    *end = buf + size;
-       int                      rc = 0, i;
-       struct lcfg_type_data   *ldata;
+       struct lustre_cfg *lcfg = (struct lustre_cfg *)(rec + 1);
+       char *ptr = buf;
+       char *end = buf + size;
+       int rc = 0, i;
+       struct lcfg_type_data *ldata;
 
        LASSERT(rec->lrh_type == OBD_CFG_REC);
        rc = lustre_cfg_sanity_check(lcfg, rec->lrh_len);
@@ -1867,7 +2115,7 @@ int class_config_yaml_output(struct llog_rec_hdr *rec, char *buf, int size)
                return rc;
 
        ldata = lcfg_cmd2data(lcfg->lcfg_command);
-       if (ldata == NULL)
+       if (!ldata)
                return -ENOTTY;
 
        if (lcfg->lcfg_command == LCFG_MARKER)
@@ -1876,35 +2124,82 @@ int class_config_yaml_output(struct llog_rec_hdr *rec, char *buf, int size)
        /* form YAML entity */
        ptr += snprintf(ptr, end - ptr, "- { index: %u, event: %s",
                        rec->lrh_index, ldata->ltd_name);
+       if (end - ptr <= 0)
+               goto out_overflow;
 
-       if (lcfg->lcfg_flags)
+       if (lcfg->lcfg_flags) {
                ptr += snprintf(ptr, end - ptr, ", flags: %#08x",
                                lcfg->lcfg_flags);
-       if (lcfg->lcfg_num)
+               if (end - ptr <= 0)
+                       goto out_overflow;
+       }
+       if (lcfg->lcfg_num) {
                ptr += snprintf(ptr, end - ptr, ", num: %#08x",
                                lcfg->lcfg_num);
+               if (end - ptr <= 0)
+                       goto out_overflow;
+       }
        if (lcfg->lcfg_nid) {
                char nidstr[LNET_NIDSTR_SIZE];
 
                libcfs_nid2str_r(lcfg->lcfg_nid, nidstr, sizeof(nidstr));
                ptr += snprintf(ptr, end - ptr, ", nid: %s(%#llx)",
                                nidstr, lcfg->lcfg_nid);
+               if (end - ptr <= 0)
+                       goto out_overflow;
        }
 
-       if (LUSTRE_CFG_BUFLEN(lcfg, 0) > 0)
+       if (LUSTRE_CFG_BUFLEN(lcfg, 0) > 0) {
                ptr += snprintf(ptr, end - ptr, ", device: %s",
                                lustre_cfg_string(lcfg, 0));
+               if (end - ptr <= 0)
+                       goto out_overflow;
+       }
+
+       if (lcfg->lcfg_command == LCFG_SET_PARAM) {
+               /*
+                * set_param -P parameters have param=val here, separate
+                * them through pointer magic and print them out in
+                * native yamlese
+                */
+               char *cfg_str = lustre_cfg_string(lcfg, 1);
+               char *tmp = strchr(cfg_str, '=');
+               size_t len;
+
+               if (!tmp)
+                       goto out_done;
+
+               ptr += snprintf(ptr, end - ptr, ", %s: ", ldata->ltd_bufs[0]);
+               len = tmp - cfg_str + 1;
+               snprintf(ptr, len, "%s", cfg_str);
+               ptr += len - 1;
+
+               ptr += snprintf(ptr, end - ptr, ", %s: ", ldata->ltd_bufs[1]);
+               ptr += snprintf(ptr, end - ptr, "%s", tmp + 1);
+
+               goto out_done;
+       }
 
        for (i = 1; i < lcfg->lcfg_bufcount; i++) {
-               if (LUSTRE_CFG_BUFLEN(lcfg, i) > 0)
+               if (LUSTRE_CFG_BUFLEN(lcfg, i) > 0) {
                        ptr += snprintf(ptr, end - ptr, ", %s: %s",
                                        ldata->ltd_bufs[i - 1],
                                        lustre_cfg_string(lcfg, i));
+                       if (end - ptr <= 0)
+                               goto out_overflow;
+               }
        }
 
+out_done:
        ptr += snprintf(ptr, end - ptr, " }\n");
-       /* return consumed bytes */
+out_overflow:
+       /* Return consumed bytes.  If the buffer overflowed, zero last byte */
        rc = ptr - buf;
+       if (rc > size) {
+               rc = -EOVERFLOW;
+               *(end - 1) = '\0';
+       }
+
        return rc;
 }
 
@@ -1939,7 +2234,7 @@ static int class_config_parse_rec(struct llog_rec_hdr *rec, char *buf, int size)
                char nidstr[LNET_NIDSTR_SIZE];
 
                libcfs_nid2str_r(lcfg->lcfg_nid, nidstr, sizeof(nidstr));
-               ptr += snprintf(ptr, end-ptr, "nid=%s(%#llx)\n     ",
+               ptr += snprintf(ptr, end-ptr, "nid=%s(%#llx)    ",
                                nidstr, lcfg->lcfg_nid);
        }
 
@@ -1967,13 +2262,13 @@ int class_config_dump_handler(const struct lu_env *env,
                              struct llog_handle *handle,
                              struct llog_rec_hdr *rec, void *data)
 {
-       char    *outstr;
-       int      rc = 0;
+       char *outstr;
+       int rc = 0;
 
        ENTRY;
 
        OBD_ALLOC(outstr, 256);
-       if (outstr == NULL)
+       if (!outstr)
                RETURN(-ENOMEM);
 
        if (rec->lrh_type == OBD_CFG_REC) {
@@ -1988,29 +2283,31 @@ int class_config_dump_handler(const struct lu_env *env,
        RETURN(rc);
 }
 
-/** Call class_cleanup and class_detach.
+/**
+ * Call class_cleanup and class_detach.
  * "Manual" only in the sense that we're faking lcfg commands.
  */
 int class_manual_cleanup(struct obd_device *obd)
 {
-        char                    flags[3] = "";
-        struct lustre_cfg      *lcfg;
-        struct lustre_cfg_bufs  bufs;
-        int                     rc;
-        ENTRY;
+       char flags[3] = "";
+       struct lustre_cfg *lcfg;
+       struct lustre_cfg_bufs bufs;
+       int rc;
 
-        if (!obd) {
-                CERROR("empty cleanup\n");
-                RETURN(-EALREADY);
-        }
+       ENTRY;
+
+       if (!obd) {
+               CERROR("empty cleanup\n");
+               RETURN(-EALREADY);
+       }
 
-        if (obd->obd_force)
-                strcat(flags, "F");
-        if (obd->obd_fail)
-                strcat(flags, "A");
+       if (obd->obd_force)
+               strlcat(flags, "F", sizeof(flags));
+       if (obd->obd_fail)
+               strlcat(flags, "A", sizeof(flags));
 
-        CDEBUG(D_CONFIG, "Manual cleanup of %s (flags='%s')\n",
-               obd->obd_name, flags);
+       CDEBUG(D_CONFIG, "Manual cleanup of %s (flags='%s')\n",
+              obd->obd_name, flags);
 
        lustre_cfg_bufs_reset(&bufs, obd->obd_name);
        lustre_cfg_bufs_set_string(&bufs, 1, flags);
@@ -2019,182 +2316,47 @@ int class_manual_cleanup(struct obd_device *obd)
                RETURN(-ENOMEM);
        lustre_cfg_init(lcfg, LCFG_CLEANUP, &bufs);
 
-        rc = class_process_config(lcfg);
-        if (rc) {
-                CERROR("cleanup failed %d: %s\n", rc, obd->obd_name);
-                GOTO(out, rc);
-        }
-
-        /* the lcfg is almost the same for both ops */
-        lcfg->lcfg_command = LCFG_DETACH;
-        rc = class_process_config(lcfg);
-        if (rc)
-                CERROR("detach failed %d: %s\n", rc, obd->obd_name);
+       rc = class_process_config(lcfg);
+       if (rc) {
+               CERROR("cleanup failed %d: %s\n", rc, obd->obd_name);
+               GOTO(out, rc);
+       }
+
+       /* the lcfg is almost the same for both ops */
+       lcfg->lcfg_command = LCFG_DETACH;
+       rc = class_process_config(lcfg);
+       if (rc)
+               CERROR("detach failed %d: %s\n", rc, obd->obd_name);
 out:
        OBD_FREE(lcfg, lustre_cfg_len(lcfg->lcfg_bufcount, lcfg->lcfg_buflens));
        RETURN(rc);
 }
 EXPORT_SYMBOL(class_manual_cleanup);
 
+#ifdef HAVE_SERVER_SUPPORT
 /*
- * uuid<->export lustre hash operations
- */
-
-static unsigned
-uuid_hash(struct cfs_hash *hs, const void *key, unsigned mask)
-{
-        return cfs_hash_djb2_hash(((struct obd_uuid *)key)->uuid,
-                                  sizeof(((struct obd_uuid *)key)->uuid), mask);
-}
-
-static void *
-uuid_key(struct hlist_node *hnode)
-{
-       struct obd_export *exp;
-
-       exp = hlist_entry(hnode, struct obd_export, exp_uuid_hash);
-
-       return &exp->exp_client_uuid;
-}
-
-/*
- * NOTE: It is impossible to find an export that is in failed
- *       state with this function
- */
-static int
-uuid_keycmp(const void *key, struct hlist_node *hnode)
-{
-        struct obd_export *exp;
-
-        LASSERT(key);
-       exp = hlist_entry(hnode, struct obd_export, exp_uuid_hash);
-
-        return obd_uuid_equals(key, &exp->exp_client_uuid) &&
-               !exp->exp_failed;
-}
-
-static void *
-uuid_export_object(struct hlist_node *hnode)
-{
-       return hlist_entry(hnode, struct obd_export, exp_uuid_hash);
-}
-
-static void
-uuid_export_get(struct cfs_hash *hs, struct hlist_node *hnode)
-{
-        struct obd_export *exp;
-
-       exp = hlist_entry(hnode, struct obd_export, exp_uuid_hash);
-        class_export_get(exp);
-}
-
-static void
-uuid_export_put_locked(struct cfs_hash *hs, struct hlist_node *hnode)
-{
-        struct obd_export *exp;
-
-       exp = hlist_entry(hnode, struct obd_export, exp_uuid_hash);
-        class_export_put(exp);
-}
-
-static struct cfs_hash_ops uuid_hash_ops = {
-        .hs_hash        = uuid_hash,
-        .hs_key         = uuid_key,
-        .hs_keycmp      = uuid_keycmp,
-        .hs_object      = uuid_export_object,
-        .hs_get         = uuid_export_get,
-        .hs_put_locked  = uuid_export_put_locked,
-};
-
-
-/*
- * nid<->export hash operations
+ * nid<->nidstats hash operations
  */
-
 static unsigned
-nid_hash(struct cfs_hash *hs, const void *key, unsigned mask)
-{
-        return cfs_hash_djb2_hash(key, sizeof(lnet_nid_t), mask);
-}
-
-static void *
-nid_key(struct hlist_node *hnode)
-{
-        struct obd_export *exp;
-
-       exp = hlist_entry(hnode, struct obd_export, exp_nid_hash);
-
-        RETURN(&exp->exp_connection->c_peer.nid);
-}
-
-/*
- * NOTE: It is impossible to find an export that is in failed
- *       state with this function
- */
-static int
-nid_kepcmp(const void *key, struct hlist_node *hnode)
-{
-        struct obd_export *exp;
-
-        LASSERT(key);
-       exp = hlist_entry(hnode, struct obd_export, exp_nid_hash);
-
-        RETURN(exp->exp_connection->c_peer.nid == *(lnet_nid_t *)key &&
-               !exp->exp_failed);
-}
-
-static void *
-nid_export_object(struct hlist_node *hnode)
-{
-       return hlist_entry(hnode, struct obd_export, exp_nid_hash);
-}
-
-static void
-nid_export_get(struct cfs_hash *hs, struct hlist_node *hnode)
-{
-        struct obd_export *exp;
-
-       exp = hlist_entry(hnode, struct obd_export, exp_nid_hash);
-        class_export_get(exp);
-}
-
-static void
-nid_export_put_locked(struct cfs_hash *hs, struct hlist_node *hnode)
+nidstats_hash(struct cfs_hash *hs, const void *key, unsigned int mask)
 {
-        struct obd_export *exp;
-
-       exp = hlist_entry(hnode, struct obd_export, exp_nid_hash);
-        class_export_put(exp);
+       return cfs_hash_djb2_hash(key, sizeof(lnet_nid_t), mask);
 }
 
-static struct cfs_hash_ops nid_hash_ops = {
-        .hs_hash        = nid_hash,
-        .hs_key         = nid_key,
-        .hs_keycmp      = nid_kepcmp,
-        .hs_object      = nid_export_object,
-        .hs_get         = nid_export_get,
-        .hs_put_locked  = nid_export_put_locked,
-};
-
-
-/*
- * nid<->nidstats hash operations
- */
-
 static void *
 nidstats_key(struct hlist_node *hnode)
 {
-        struct nid_stat *ns;
+       struct nid_stat *ns;
 
        ns = hlist_entry(hnode, struct nid_stat, nid_hash);
 
-        return &ns->nid;
+       return &ns->nid;
 }
 
 static int
 nidstats_keycmp(const void *key, struct hlist_node *hnode)
 {
-        return *(lnet_nid_t *)nidstats_key(hnode) == *(lnet_nid_t *)key;
+       return *(lnet_nid_t *)nidstats_key(hnode) == *(lnet_nid_t *)key;
 }
 
 static void *
@@ -2206,28 +2368,28 @@ nidstats_object(struct hlist_node *hnode)
 static void
 nidstats_get(struct cfs_hash *hs, struct hlist_node *hnode)
 {
-        struct nid_stat *ns;
+       struct nid_stat *ns;
 
        ns = hlist_entry(hnode, struct nid_stat, nid_hash);
-        nidstat_getref(ns);
+       nidstat_getref(ns);
 }
 
 static void
 nidstats_put_locked(struct cfs_hash *hs, struct hlist_node *hnode)
 {
-        struct nid_stat *ns;
+       struct nid_stat *ns;
 
        ns = hlist_entry(hnode, struct nid_stat, nid_hash);
-        nidstat_putref(ns);
+       nidstat_putref(ns);
 }
 
 static struct cfs_hash_ops nid_stat_hash_ops = {
-        .hs_hash        = nid_hash,
-        .hs_key         = nidstats_key,
-        .hs_keycmp      = nidstats_keycmp,
-        .hs_object      = nidstats_object,
-        .hs_get         = nidstats_get,
-        .hs_put_locked  = nidstats_put_locked,
+       .hs_hash        = nidstats_hash,
+       .hs_key         = nidstats_key,
+       .hs_keycmp      = nidstats_keycmp,
+       .hs_object      = nidstats_object,
+       .hs_get         = nidstats_get,
+       .hs_put_locked  = nidstats_put_locked,
 };
 
 
@@ -2299,3 +2461,5 @@ static struct cfs_hash_ops gen_hash_ops = {
        .hs_get         = gen_export_get,
        .hs_put_locked  = gen_export_put_locked,
 };
+
+#endif /* HAVE_SERVER_SUPPORT */