Whamcloud - gitweb
LU-3963 obdclass: convert to linux list api
[fs/lustre-release.git] / lustre / obdclass / obd_config.c
index 931d5d3..c080610 100644 (file)
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- *  Copyright (c) 2001-2003 Cluster File Systems, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
  *
- * Config API
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2013, Intel Corporation.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  *
+ * lustre/obdclass/obd_config.c
+ *
+ * Config API
  */
 
 #define DEBUG_SUBSYSTEM S_CLASS
 #ifdef __KERNEL__
-#include <linux/kmod.h>   /* for request_module() */
-#include <linux/module.h>
-#include <linux/obd_class.h>
-#include <linux/random.h>
-#include <linux/slab.h>
-#include <linux/pagemap.h>
-#else 
+#include <obd_class.h>
+#include <linux/string.h>
+#include <lustre_disk.h>
+#else
 #include <liblustre.h>
-#include <linux/obd_class.h>
-#include <linux/obd.h>
+#include <string.h>
+#include <obd_class.h>
+#include <obd.h>
 #endif
-#include <linux/lustre_log.h>
-#include <linux/lprocfs_status.h>
-#include <portals/list.h>
+#include <lustre_ioctl.h>
+#include <lustre_log.h>
+#include <lprocfs_status.h>
+#include <lustre_param.h>
+
+#include "llog_internal.h"
+
+static cfs_hash_ops_t uuid_hash_ops;
+static cfs_hash_ops_t nid_hash_ops;
+static cfs_hash_ops_t nid_stat_hash_ops;
 
+/*********** string parsing utils *********/
 
-/* Create a new device and set the type, name and uuid.  If
- * successful, the new device can be accessed by either name or uuid.
+/* returns 0 if we find this key in the buffer, else 1 */
+int class_find_param(char *buf, char *key, char **valp)
+{
+        char *ptr;
+
+        if (!buf)
+                return 1;
+
+        if ((ptr = strstr(buf, key)) == NULL)
+                return 1;
+
+        if (valp)
+                *valp = ptr + strlen(key);
+
+        return 0;
+}
+EXPORT_SYMBOL(class_find_param);
+
+/**
+ * Check whether the proc parameter \a param is an old parameter or not from
+ * the array \a ptr which contains the mapping from old parameters to new ones.
+ * If it's an old one, then return the pointer to the cfg_interop_param struc-
+ * ture which contains both the old and new parameters.
+ *
+ * \param param                        proc parameter
+ * \param ptr                  an array which contains the mapping from
+ *                             old parameters to new ones
+ *
+ * \retval valid-pointer       pointer to the cfg_interop_param structure
+ *                             which contains the old and new parameters
+ * \retval NULL                        \a param or \a ptr is NULL,
+ *                             or \a param is not an old parameter
  */
-int class_attach(struct lustre_cfg *lcfg)
+struct cfg_interop_param *class_find_old_param(const char *param,
+                                              struct cfg_interop_param *ptr)
 {
-        int minor;
-        struct obd_type *type;
-        int err = 0;
-        int len;
-       char *typename;
-       char *name;
-       char *uuid;
-       struct obd_device *obd;
-       int dev;
-                 
-       if (!lcfg->lcfg_inllen1 || !lcfg->lcfg_inlbuf1) {
-               CERROR("No type passed!\n");
-               RETURN(-EINVAL);
-       }
-       if (lcfg->lcfg_inlbuf1[lcfg->lcfg_inllen1 - 1] != 0) {
-               CERROR("Type not nul terminated!\n");
-               RETURN(-EINVAL);
+       char *value = NULL;
+       int   name_len = 0;
+
+       if (param == NULL || ptr == NULL)
+               RETURN(NULL);
+
+       value = strchr(param, '=');
+       if (value == NULL)
+               name_len = strlen(param);
+       else
+               name_len = value - param;
+
+       while (ptr->old_param != NULL) {
+               if (strncmp(param, ptr->old_param, name_len) == 0 &&
+                   name_len == strlen(ptr->old_param))
+                       RETURN(ptr);
+               ptr++;
        }
-       typename = lcfg->lcfg_inlbuf1;
 
-       if (!lcfg->lcfg_dev_namelen || !lcfg->lcfg_dev_name) {
-               CERROR("No name passed!\n");
-               RETURN(-EINVAL);
-       }
-       if (lcfg->lcfg_dev_name[lcfg->lcfg_dev_namelen - 1] != 0) {
-               CERROR("Name not nul terminated!\n");
-               RETURN(-EINVAL);
-       }
-       name = lcfg->lcfg_dev_name;
+       RETURN(NULL);
+}
+EXPORT_SYMBOL(class_find_old_param);
 
-       if (!lcfg->lcfg_inllen2 || !lcfg->lcfg_inlbuf2) {
-               CERROR("No UUID passed!\n");
-               RETURN(-EINVAL);
-       }
-       if (lcfg->lcfg_inlbuf2[lcfg->lcfg_inllen2 - 1] != 0) {
-               CERROR("UUID not nul terminated!\n");
-               RETURN(-EINVAL);
-       }
-       uuid = lcfg->lcfg_inlbuf2;
+/**
+ * Finds a parameter in \a params and copies it to \a copy.
+ *
+ * Leading spaces are skipped. Next space or end of string is the
+ * parameter terminator with the exception that spaces inside single or double
+ * quotes get included into a parameter. The parameter is copied into \a copy
+ * which has to be allocated big enough by a caller, quotes are stripped in
+ * the copy and the copy is terminated by 0.
+ *
+ * On return \a params is set to next parameter or to NULL if last
+ * parameter is returned.
+ *
+ * \retval 0 if parameter is returned in \a copy
+ * \retval 1 otherwise
+ * \retval -EINVAL if unbalanced quota is found
+ */
+int class_get_next_param(char **params, char *copy)
+{
+        char *q1, *q2, *str;
+        int len;
 
-       CDEBUG(D_IOCTL, "attach type %s name: %s uuid: %s\n",
-              MKSTR(lcfg->lcfg_inlbuf1),
-              MKSTR(lcfg->lcfg_dev_name), MKSTR(lcfg->lcfg_inlbuf2));
+        str = *params;
+        while (*str == ' ')
+                str++;
 
-        /* find the type */
-        type = class_get_type(typename);
-        if (!type) {
-                CERROR("OBD: unknown type: %s\n", typename);
-                RETURN(-EINVAL);
+        if (*str == '\0') {
+                *params = NULL;
+                return 1;
         }
-        
-        obd = class_name2obd(name);
-        if (obd != NULL) {
-                CERROR("obd %s already attached\n", name);
-                RETURN(-EEXIST);
+
+        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;
+}
+EXPORT_SYMBOL(class_get_next_param);
 
-       obd = class_newdev(&dev);
-       if (obd == NULL)
-               RETURN(-EINVAL);
+/* 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, char *key, char **valp)
+{
+        if (!buf)
+                return 1;
 
-       /* have we attached a type to this device */
-       if (obd->obd_attached || obd->obd_type) {
-               CERROR("OBD: Device %d already typed as %s.\n",
-                      obd->obd_minor, MKSTR(obd->obd_type->typ_name));
-               RETURN(-EBUSY);
-       }
+        if (memcmp(buf, key, strlen(key)) != 0)
+                return 1;
 
-        LASSERT(obd == (obd_dev + obd->obd_minor));
-
-        minor = obd->obd_minor;
-        memset(obd, 0, sizeof(*obd));
-        obd->obd_minor = minor;
-        obd->obd_type = type;
-        INIT_LIST_HEAD(&obd->obd_exports);
-        obd->obd_num_exports = 0;
-        spin_lock_init(&obd->obd_dev_lock);
-        init_waitqueue_head(&obd->obd_refcount_waitq);
-        
-        /* XXX belongs in setup not attach  */
-        /* recovery data */
-        spin_lock_init(&obd->obd_processing_task_lock);
-        init_waitqueue_head(&obd->obd_next_transno_waitq);
-        INIT_LIST_HEAD(&obd->obd_recovery_queue);
-        INIT_LIST_HEAD(&obd->obd_delayed_reply_queue);
-        
-        init_waitqueue_head(&obd->obd_commit_waitq);
-        
-        len = strlen(name) + 1;
-        OBD_ALLOC(obd->obd_name, len);
-        if (!obd->obd_name) {
-                class_put_type(obd->obd_type);
-                obd->obd_type = NULL;
-                RETURN(-ENOMEM);
+        if (valp)
+                *valp = buf + strlen(key);
+
+        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;
+
+        *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;
+}
+
+static int parse_net(char *buf, void *value)
+{
+        __u32 *net = (__u32 *)value;
+
+        *net = libcfs_str2net(buf);
+        CDEBUG(D_INFO, "Net %s\n", libcfs_net2str(*net));
+        return 0;
+}
+
+enum {
+        CLASS_PARSE_NID = 1,
+        CLASS_PARSE_NET,
+};
+
+/* 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:
+               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;
+}
+
+int class_parse_nid(char *buf, lnet_nid_t *nid, char **endh)
+{
+       return class_parse_value(buf, CLASS_PARSE_NID, (void *)nid, endh, 0);
+}
+EXPORT_SYMBOL(class_parse_nid);
+
+int class_parse_nid_quiet(char *buf, lnet_nid_t *nid, char **endh)
+{
+       return class_parse_value(buf, CLASS_PARSE_NID, (void *)nid, endh, 1);
+}
+EXPORT_SYMBOL(class_parse_nid_quiet);
+
+int class_parse_net(char *buf, __u32 *net, char **endh)
+{
+       return class_parse_value(buf, CLASS_PARSE_NET, (void *)net, endh, 0);
+}
+EXPORT_SYMBOL(class_parse_net);
+
+/* 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;
         }
-        memcpy(obd->obd_name, name, len);
-        
+        return rc;
+}
+EXPORT_SYMBOL(class_match_nid);
+
+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;
+}
+EXPORT_SYMBOL(class_match_net);
+
+/********************** class fns **********************/
+
+/**
+ * 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 */
+       cfs_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 < "LPSZ" bytes long\n",
-                       sizeof(obd->obd_uuid));
-                OBD_FREE(obd->obd_name, strlen(obd->obd_name) + 1);
-                class_put_type(obd->obd_type);
-                obd->obd_type = NULL;
-                RETURN(-EINVAL);
+                CERROR("uuid must be < %d bytes long\n",
+                       (int)sizeof(obd->obd_uuid));
+                GOTO(out, rc = -EINVAL);
         }
         memcpy(obd->obd_uuid.uuid, uuid, len);
 
-        /* do the attach */
-        if (OBP(obd, attach))
-                err = OBP(obd,attach)(obd, sizeof *lcfg, lcfg);
-
-        if (err) {
-                OBD_FREE(obd->obd_name, strlen(obd->obd_name) + 1);
-                class_put_type(obd->obd_type);
-                obd->obd_type = NULL;
-        } else {
-                obd->obd_attached = 1;
-                type->typ_refcnt++;
-                CDEBUG(D_IOCTL, "OBD: dev %d attached type %s\n",
-                       obd->obd_minor, typename);
+        /* 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);
+
+        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(err);
+        return rc;
 }
+EXPORT_SYMBOL(class_attach);
 
+/** 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 == (obd_dev + obd->obd_minor));
+        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) {
@@ -184,340 +468,755 @@ int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
                 RETURN(-ENODEV);
         }
 
-        /* has this been done already? */
         if (obd->obd_set_up) {
                 CERROR("Device %d already setup (type %s)\n",
                        obd->obd_minor, obd->obd_type->typ_name);
-                RETURN(-EBUSY);
+                RETURN(-EEXIST);
         }
 
-        atomic_set(&obd->obd_refcount, 0);
-
-        err = obd_setup(obd, sizeof(*lcfg), lcfg);
-        if (err) {
-                RETURN(err);
+        /* 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);
         }
-        
-        obd->obd_type->typ_refcnt++;
-        obd->obd_set_up = 1;
+        /* 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;
+       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);
+
+        exp = class_new_export(obd, &obd->obd_uuid);
+        if (IS_ERR(exp))
+                GOTO(err_hash, err = PTR_ERR(exp));
 
-        exp = class_new_export(obd);
-        if (exp == NULL) {
-                GOTO(err_cleanup, err = -ENOMEM);
-        }
-        memcpy(&exp->exp_client_uuid, &obd->obd_uuid, 
-               sizeof(exp->exp_client_uuid));
         obd->obd_self_export = exp;
+       list_del_init(&exp->exp_obd_chain_timed);
         class_export_put(exp);
 
-        if (OBT(obd) && OBP(obd, postsetup)) {
-                err = obd_postsetup(obd);
-                if (err) 
-                        GOTO(err_exp, err);
-        } 
+        err = obd_setup(obd, lcfg);
+        if (err)
+                GOTO(err_exp, err);
 
-        RETURN(err);
+        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:
-        class_unlink_export(obd->obd_self_export);
-        obd->obd_self_export = NULL;
-err_cleanup:
-        obd->obd_stopping = 1;
-        obd_cleanup(obd, 0);
-        obd->obd_set_up = obd->obd_stopping = 0;
-        obd->obd_type->typ_refcnt--;
-        RETURN(err);
+        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;
+        }
+        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.
+ * There can be no more references to this obd.
+ */
 int class_detach(struct obd_device *obd, struct lustre_cfg *lcfg)
 {
-        int minor;
-        int err = 0;
-
         ENTRY;
+
         if (obd->obd_set_up) {
                 CERROR("OBD device %d still set up\n", obd->obd_minor);
                 RETURN(-EBUSY);
         }
-        if (!obd->obd_attached) {
-                CERROR("OBD device %d not attached\n", obd->obd_minor);
-                RETURN(-ENODEV);
-        }
-        if (OBP(obd, detach))
-                err = OBP(obd,detach)(obd);
-
-        if (obd->obd_name) {
-                OBD_FREE(obd->obd_name, strlen(obd->obd_name)+1);
-                obd->obd_name = NULL;
-        } else 
-                CERROR("device %d: no name at detach\n", obd->obd_minor);
-
-        obd->obd_attached = 0;
-        obd->obd_type->typ_refcnt--;
-        class_put_type(obd->obd_type);
-        obd->obd_type = NULL;
-        minor = obd->obd_minor;
-        memset(obd, 0, sizeof(*obd));
-        obd->obd_minor = minor;
-        RETURN(err);
-}
 
-static void dump_exports(struct obd_device *obd)
-{
-        struct obd_export *exp, *n;
+       spin_lock(&obd->obd_dev_lock);
+       if (!obd->obd_attached) {
+               spin_unlock(&obd->obd_dev_lock);
+               CERROR("OBD device %d not attached\n", obd->obd_minor);
+               RETURN(-ENODEV);
+       }
+       obd->obd_attached = 0;
+       spin_unlock(&obd->obd_dev_lock);
 
-        list_for_each_entry_safe(exp, n, &obd->obd_exports, exp_obd_chain) {
-                CERROR("%s: %p %s %d %d %p\n",
-                       obd->obd_name, exp, exp->exp_client_uuid.uuid,
-                       atomic_read(&exp->exp_refcount),
-                       exp->exp_failed, exp->exp_outstanding_reply );
-        }
+        CDEBUG(D_IOCTL, "detach on obd %s (uuid %s)\n",
+               obd->obd_name, obd->obd_uuid.uuid);
+
+        class_decref(obd, "attach", obd);
+        RETURN(0);
 }
+EXPORT_SYMBOL(class_detach);
 
+/** 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().
+ */
 int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg)
 {
-        int flags = 0;
-       int err = 0;
+        int err = 0;
         char *flag;
-        
         ENTRY;
+
+        OBD_RACE(OBD_FAIL_LDLM_RECOV_CLIENTS);
+
         if (!obd->obd_set_up) {
                 CERROR("Device %d not setup\n", obd->obd_minor);
                 RETURN(-ENODEV);
         }
 
-        if (lcfg->lcfg_inlbuf1) {
-                for (flag = lcfg->lcfg_inlbuf1; *flag != 0; flag++)
+       spin_lock(&obd->obd_dev_lock);
+       if (obd->obd_stopping) {
+               spin_unlock(&obd->obd_dev_lock);
+               CERROR("OBD %d already stopping\n", obd->obd_minor);
+               RETURN(-ENODEV);
+       }
+       /* Leave this on forever */
+       obd->obd_stopping = 1;
+       spin_unlock(&obd->obd_dev_lock);
+
+       /* wait for already-arrived-connections to finish. */
+       while (obd->obd_conn_inprogress > 0)
+               yield();
+       smp_rmb();
+
+        if (lcfg->lcfg_bufcount >= 2 && LUSTRE_CFG_BUFLEN(lcfg, 1) > 0) {
+                for (flag = lustre_cfg_string(lcfg, 1); *flag != 0; flag++)
                         switch (*flag) {
                         case 'F':
-                                flags |= OBD_OPT_FORCE;
+                                obd->obd_force = 1;
                                 break;
                         case 'A':
-                                flags |= OBD_OPT_FAILOVER;
+                                LCONSOLE_WARN("Failing over %s\n",
+                                              obd->obd_name);
+                                obd->obd_fail = 1;
+                                obd->obd_no_transno = 1;
+                                obd->obd_no_recov = 1;
+                                if (OBP(obd, iocontrol)) {
+                                        obd_iocontrol(OBD_IOC_SYNC,
+                                                      obd->obd_self_export,
+                                                      0, NULL, NULL);
+                                }
                                 break;
                         default:
-                                CERROR("unrecognised flag '%c'\n",
-                                       *flag);
+                                CERROR("Unrecognised flag '%c'\n", *flag);
                         }
         }
 
-        /* The one reference that should be remaining is the
-         * obd_self_export */
-        if (atomic_read(&obd->obd_refcount) <= 1 ||
-            flags & OBD_OPT_FORCE) {
-                /* this will stop new connections, and need to
-                   do it before class_disconnect_exports() */
-                obd->obd_stopping = 1;
+        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);
+                class_disconnect_exports(obd);
         }
 
-        if (atomic_read(&obd->obd_refcount) > 1) {
-                struct l_wait_info lwi = LWI_TIMEOUT_INTR(1 * HZ, NULL,
-                                                          NULL, NULL);
-                int rc;
+        /* Precleanup, we must make sure all exports get destroyed. */
+        err = obd_precleanup(obd, OBD_CLEANUP_EXPORTS);
+        if (err)
+                CERROR("Precleanup %s returned %d\n",
+                       obd->obd_name, err);
 
-                if (!(flags & OBD_OPT_FORCE)) {
-                        CERROR("OBD device %d (%p) has refcount %d\n",
-                               obd->obd_minor, obd,
-                               atomic_read(&obd->obd_refcount));
-                        dump_exports(obd);
-                        GOTO(out, err = -EBUSY);
-                }
-                class_disconnect_exports(obd, flags);
-                CDEBUG(D_IOCTL,
-                       "%s: waiting for obd refs to go away: %d\n",
-                       obd->obd_name, atomic_read(&obd->obd_refcount));
-
-                rc = l_wait_event(obd->obd_refcount_waitq,
-                                  atomic_read(&obd->obd_refcount) < 2, &lwi);
-                if (rc == 0) {
-                        LASSERT(atomic_read(&obd->obd_refcount) == 1);
-                } else {
-                        CERROR("wait cancelled cleaning anyway. "
-                               "refcount: %d\n",
-                               atomic_read(&obd->obd_refcount));
-                        dump_exports(obd);
-                }
-                CDEBUG(D_IOCTL, "%s: awake, now finishing cleanup\n",
-                       obd->obd_name);
+        /* destroy an uuid-export hash body */
+        if (obd->obd_uuid_hash) {
+                cfs_hash_putref(obd->obd_uuid_hash);
+                obd->obd_uuid_hash = NULL;
         }
 
-        if (obd->obd_self_export) {
-                err = obd_precleanup(obd, flags);
-                if (err) 
-                        GOTO(out, err);
+        /* destroy a nid-export hash body */
+        if (obd->obd_nid_hash) {
+                cfs_hash_putref(obd->obd_nid_hash);
+                obd->obd_nid_hash = NULL;
+        }
+
+        /* destroy a nid-stats hash body */
+        if (obd->obd_nid_stats_hash) {
+                cfs_hash_putref(obd->obd_nid_stats_hash);
+                obd->obd_nid_stats_hash = NULL;
+        }
+
+        class_decref(obd, "setup", obd);
+        obd->obd_set_up = 0;
+
+        RETURN(0);
+}
+EXPORT_SYMBOL(class_cleanup);
+
+struct obd_device *class_incref(struct obd_device *obd,
+                                const char *scope, const void *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,
+              atomic_read(&obd->obd_refcount));
+
+        return obd;
+}
+EXPORT_SYMBOL(class_incref);
+
+void class_decref(struct obd_device *obd, const char *scope, const void *source)
+{
+       int err;
+       int refs;
+
+       spin_lock(&obd->obd_dev_lock);
+       atomic_dec(&obd->obd_refcount);
+       refs = atomic_read(&obd->obd_refcount);
+       spin_unlock(&obd->obd_dev_lock);
+       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);
-                obd->obd_self_export = NULL;
+                return;
         }
 
-        err = obd_cleanup(obd, flags);
-out:
-        if (!err) {
-                obd->obd_set_up = obd->obd_stopping = 0;
-                obd->obd_type->typ_refcnt--;
-                /* XXX this should be an LASSERT */
-                if (atomic_read(&obd->obd_refcount) > 0) 
-                        CERROR("%s still has refcount %d after "
-                               "cleanup.\n", obd->obd_name,
-                               atomic_read(&obd->obd_refcount));
-        } 
+        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);
+                }
 
-        RETURN(err);
+                class_release_dev(obd);
+        }
+}
+EXPORT_SYMBOL(class_decref);
+
+/** 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) &&
+           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);
+        }
+
+        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);
+
+        RETURN(rc);
+}
+EXPORT_SYMBOL(class_add_conn);
+
+/** Remove a failover nid location.
+ */
+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);
 }
 
-LIST_HEAD(lustre_profile_list);
+struct list_head lustre_profile_list =
+       LIST_HEAD_INIT(lustre_profile_list);
 
-struct lustre_profile *class_get_profile(char * prof)
+struct lustre_profile *class_get_profile(const char * prof)
 {
         struct lustre_profile *lprof;
-        
-        list_for_each_entry(lprof, &lustre_profile_list, lp_list) {
+
+        ENTRY;
+       list_for_each_entry(lprof, &lustre_profile_list, lp_list) {
                 if (!strcmp(lprof->lp_profile, prof)) {
                         RETURN(lprof);
                 }
         }
         RETURN(NULL);
 }
+EXPORT_SYMBOL(class_get_profile);
 
-int class_add_profile(int proflen, char *prof, 
-                      int osclen, char *osc, 
+/** 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.
+ */
+int class_add_profile(int proflen, char *prof, int osclen, char *osc,
                       int mdclen, char *mdc)
 {
         struct lustre_profile *lprof;
         int err = 0;
+        ENTRY;
+
+        CDEBUG(D_CONFIG, "Add profile %s\n", prof);
 
         OBD_ALLOC(lprof, sizeof(*lprof));
         if (lprof == NULL)
-                GOTO(out, err = -ENOMEM);
-        INIT_LIST_HEAD(&lprof->lp_list);
+                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_osc, osclen);
-        if (lprof->lp_profile == NULL)
+        OBD_ALLOC(lprof->lp_dt, osclen);
+        if (lprof->lp_dt == NULL)
                 GOTO(out, err = -ENOMEM);
-        memcpy(lprof->lp_osc, osc, osclen);
+        memcpy(lprof->lp_dt, osc, osclen);
 
         if (mdclen > 0) {
                 LASSERT(mdclen == (strlen(mdc) + 1));
-                OBD_ALLOC(lprof->lp_mdc, mdclen);
-                if (lprof->lp_mdc == NULL)
+                OBD_ALLOC(lprof->lp_md, mdclen);
+                if (lprof->lp_md == NULL)
                         GOTO(out, err = -ENOMEM);
-                memcpy(lprof->lp_mdc, mdc, mdclen);
+                memcpy(lprof->lp_md, mdc, mdclen);
         }
 
-        list_add(&lprof->lp_list, &lustre_profile_list);
+       list_add(&lprof->lp_list, &lustre_profile_list);
+        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);
 }
 
-void class_del_profile(char *prof)
+void class_del_profile(const char *prof)
 {
         struct lustre_profile *lprof;
-        
+        ENTRY;
+
+        CDEBUG(D_CONFIG, "Del profile %s\n", prof);
+
         lprof = class_get_profile(prof);
         if (lprof) {
-                list_del(&lprof->lp_list);
+               list_del(&lprof->lp_list);
                 OBD_FREE(lprof->lp_profile, strlen(lprof->lp_profile) + 1);
-                OBD_FREE(lprof->lp_osc, strlen(lprof->lp_osc) + 1);
-                if (lprof->lp_mdc)
-                        OBD_FREE(lprof->lp_mdc, strlen(lprof->lp_mdc) + 1);
+                OBD_FREE(lprof->lp_dt, strlen(lprof->lp_dt) + 1);
+                if (lprof->lp_md)
+                        OBD_FREE(lprof->lp_md, strlen(lprof->lp_md) + 1);
                 OBD_FREE(lprof, sizeof *lprof);
         }
+        EXIT;
 }
+EXPORT_SYMBOL(class_del_profile);
 
+/* COMPAT_146 */
+void class_del_profiles(void)
+{
+        struct lustre_profile *lprof, *n;
+        ENTRY;
+
+       list_for_each_entry_safe(lprof, n, &lustre_profile_list, lp_list) {
+               list_del(&lprof->lp_list);
+                OBD_FREE(lprof->lp_profile, strlen(lprof->lp_profile) + 1);
+                OBD_FREE(lprof->lp_dt, strlen(lprof->lp_dt) + 1);
+                if (lprof->lp_md)
+                        OBD_FREE(lprof->lp_md, strlen(lprof->lp_md) + 1);
+                OBD_FREE(lprof, sizeof *lprof);
+        }
+        EXIT;
+}
+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;
+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);
+
+/**
+ * Rename the proc parameter in \a cfg with a new name \a new_name.
+ *
+ * \param cfg     config structure which contains the proc parameter
+ * \param new_name new name of the proc parameter
+ *
+ * \retval valid-pointer    pointer to the newly-allocated config structure
+ *                         which contains the renamed proc parameter
+ * \retval ERR_PTR(-EINVAL) if \a cfg or \a new_name is NULL, or \a cfg does
+ *                         not contain a proc parameter
+ * \retval ERR_PTR(-ENOMEM) if memory allocation failure occurs
+ */
+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;
+       ENTRY;
+
+       if (cfg == NULL || new_name == NULL)
+               RETURN(ERR_PTR(-EINVAL));
+
+       param = lustre_cfg_string(cfg, 1);
+       if (param == NULL)
+               RETURN(ERR_PTR(-EINVAL));
+
+       value = strchr(param, '=');
+       if (value == NULL)
+               name_len = strlen(param);
+       else
+               name_len = value - param;
+
+       new_len = LUSTRE_CFG_BUFLEN(cfg, 1) + strlen(new_name) - name_len;
+
+       OBD_ALLOC(new_param, new_len);
+       if (new_param == NULL)
+               RETURN(ERR_PTR(-ENOMEM));
+
+       strcpy(new_param, new_name);
+       if (value != NULL)
+               strcat(new_param, value);
+
+       OBD_ALLOC_PTR(bufs);
+       if (bufs == NULL) {
+               OBD_FREE(new_param, new_len);
+               RETURN(ERR_PTR(-ENOMEM));
+       }
+
+       lustre_cfg_bufs_reset(bufs, NULL);
+       lustre_cfg_bufs_init(bufs, cfg);
+       lustre_cfg_bufs_set_string(bufs, 1, new_param);
+
+       new_cfg = lustre_cfg_new(cfg->lcfg_command, bufs);
+
+       OBD_FREE(new_param, new_len);
+       OBD_FREE_PTR(bufs);
+       if (new_cfg == NULL)
+               RETURN(ERR_PTR(-ENOMEM));
+
+       new_cfg->lcfg_num = cfg->lcfg_num;
+       new_cfg->lcfg_flags = cfg->lcfg_flags;
+       new_cfg->lcfg_nid = cfg->lcfg_nid;
+       new_cfg->lcfg_nal = cfg->lcfg_nal;
+
+       RETURN(new_cfg);
+}
+EXPORT_SYMBOL(lustre_cfg_rename);
+
+static int process_param2_config(struct lustre_cfg *lcfg)
+{
+       char *param = lustre_cfg_string(lcfg, 1);
+       char *upcall = lustre_cfg_string(lcfg, 2);
+       char *argv[] = {
+               [0] = "/usr/sbin/lctl",
+               [1] = "set_param",
+               [2] = param,
+               [3] = NULL
+       };
+       struct timeval  start;
+       struct timeval  end;
+       int             rc;
+       ENTRY;
+
+       /* Add upcall processing here. Now only lctl is supported */
+       if (strcmp(upcall, LCTL_UPCALL) != 0) {
+               CERROR("Unsupported upcall %s\n", upcall);
+               RETURN(-EINVAL);
+       }
+
+       do_gettimeofday(&start);
+       rc = call_usermodehelper(argv[0], argv, NULL, 0);
+       do_gettimeofday(&end);
+
+       if (rc < 0) {
+               CERROR("lctl: error invoking upcall %s %s %s: rc = %d; "
+                      "time %ldus\n", argv[0], argv[1], argv[2], rc,
+                      cfs_timeval_sub(&end, &start, NULL));
+       } else {
+               CDEBUG(D_HA, "lctl: invoked upcall %s %s %s, time %ldus\n",
+                      argv[0], argv[1], argv[2],
+                      cfs_timeval_sub(&end, &start, NULL));
+                      rc = 0;
+       }
+
+       RETURN(rc);
+}
+
+void lustre_register_quota_process_config(int (*qpc)(struct lustre_cfg *lcfg))
+{
+       quota_process_config = qpc;
+}
+EXPORT_SYMBOL(lustre_register_quota_process_config);
+
+/** 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;
-        char str[PTL_NALFMT_SIZE];
+        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) {
+        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 "LPX64
-                       " (%s), nal %d\n", lcfg->lcfg_inlbuf1, lcfg->lcfg_nid,
-                       portals_nid2str(lcfg->lcfg_nal, lcfg->lcfg_nid, str),
-                       lcfg->lcfg_nal);
+                       " (%s)\n", lustre_cfg_string(lcfg, 1),
+                       lcfg->lcfg_nid, libcfs_nid2str(lcfg->lcfg_nid));
 
-                err = class_add_uuid(lcfg->lcfg_inlbuf1, lcfg->lcfg_nid,
-                                     lcfg->lcfg_nal);
+                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_inlbuf1 == NULL ? "<all uuids>" :
-                       lcfg->lcfg_inlbuf1);
+                       (lcfg->lcfg_bufcount < 2 || LUSTRE_CFG_BUFLEN(lcfg, 1) == 0)
+                       ? "<all uuids>" : lustre_cfg_string(lcfg, 1));
 
-                err = class_del_uuid(lcfg->lcfg_inlbuf1);
+                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", 
-                       lcfg->lcfg_inlbuf1, lcfg->lcfg_inlbuf2, lcfg->lcfg_inlbuf3);
+                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(lcfg->lcfg_inllen1, lcfg->lcfg_inlbuf1, 
-                                        lcfg->lcfg_inllen2, lcfg->lcfg_inlbuf2, 
-                                        lcfg->lcfg_inllen3, lcfg->lcfg_inlbuf3);
+                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", lcfg->lcfg_inlbuf1);
-                /* set these mount options somewhere, so ll_fill_super
-                 * can find them. */
-                class_del_profile(lcfg->lcfg_inlbuf1);
+                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 = lcfg->lcfg_num;
+                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);
+               ldlm_timeout_set = 1;
                 GOTO(out, err = 0);
         }
         case LCFG_SET_UPCALL: {
-                CDEBUG(D_IOCTL, "setting lustre ucpall to: %s\n", 
-                       lcfg->lcfg_inlbuf1);
-                if (lcfg->lcfg_inllen1 > sizeof obd_lustre_upcall)
-                        GOTO(out, err = -EINVAL);
-                memcpy(obd_lustre_upcall, lcfg->lcfg_inlbuf1, 
-                       lcfg->lcfg_inllen1);
+                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, 0) == 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);
+                       /*
+                        * Client or server should not fail to mount if
+                        * it hits an unknown configuration parameter.
+                        */
+                       if (err != 0)
+                               CWARN("Ignoring unknown param %s\n", tmp);
+
+                       GOTO(out, err = 0);
+               } 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);
+               }
+
+               break;
        }
-       
-
-       /* Commands that require a device */
-        obd = class_name2obd(lcfg->lcfg_dev_name);
+       case LCFG_SET_PARAM: {
+               err = process_param2_config(lcfg);
+               GOTO(out, err = 0);
+       }
+       }
+        /* Commands that require a device */
+        obd = class_name2obd(lustre_cfg_string(lcfg, 0));
         if (obd == NULL) {
-                if (lcfg->lcfg_dev_name == NULL) {
+                if (!LUSTRE_CFG_BUFLEN(lcfg, 0))
                         CERROR("this lcfg command requires a device name\n");
-                } else {
-                        CERROR("no device for: %s\n", lcfg->lcfg_dev_name);
-                }
+                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);
         }
+
+       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);
@@ -526,207 +1225,993 @@ int class_process_config(struct lustre_cfg *lcfg)
                 err = class_cleanup(obd, lcfg);
                 GOTO(out, err = 0);
         }
-        default: { 
+        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),
+                                   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);
+
+        }
+        }
+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;
+}
+EXPORT_SYMBOL(class_process_config);
+
+#ifndef HAVE_ONLY_PROCFS_SEQ
+int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars,
+                             struct lustre_cfg *lcfg, void *data)
+{
+#ifdef __KERNEL__
+        struct lprocfs_vars *var;
+        char *key, *sval;
+        int i, keylen, vallen;
+        int matched = 0, j = 0;
+        int rc = 0;
+        int skip = 0;
+        ENTRY;
+
+        if (lcfg->lcfg_command != LCFG_PARAM) {
                 CERROR("Unknown command: %d\n", lcfg->lcfg_command);
-                GOTO(out, err = -EINVAL);
+                RETURN(-EINVAL);
+        }
 
+        /* 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++) {
+                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)) {
+                        CERROR("Can't parse param %s (missing '=')\n", key);
+                        /* rc = -EINVAL;        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, (char *)var->name, 0) == 0 &&
+                            keylen == strlen(var->name)) {
+                                matched++;
+                                rc = -EROFS;
+
+                               if (var->write_fptr) {
+                                       mm_segment_t oldfs;
+                                       oldfs = get_fs();
+                                       set_fs(KERNEL_DS);
+                                       rc = (var->write_fptr)(NULL, sval,
+                                                               vallen, data);
+                                       set_fs(oldfs);
+                               }
+                               break;
+                        }
+                        j++;
+                }
+               if (!matched) {
+                       CERROR("%.*s: %s unknown param %s\n",
+                              (int)strlen(prefix) - 1, prefix,
+                              (char *)lustre_cfg_string(lcfg, 0), key);
+                       /* rc = -EINVAL;        continue parsing other params */
+                       skip++;
+               } else if (rc < 0) {
+                       CERROR("%s: error writing proc entry '%s': rc = %d\n",
+                              prefix, var->name, rc);
+                       rc = 0;
+               } else {
+                       CDEBUG(D_CONFIG, "%s.%.*s: Set parameter %.*s=%s\n",
+                                        lustre_cfg_string(lcfg, 0),
+                                        (int)strlen(prefix) - 1, prefix,
+                                        (int)(sval - key - 1), key, sval);
+               }
         }
+
+        if (rc > 0)
+                rc = 0;
+        if (!rc && skip)
+                rc = skip;
+        RETURN(rc);
+#else
+        CDEBUG(D_CONFIG, "liblustre can't process params.\n");
+        /* Don't throw config error */
+        RETURN(0);
+#endif
+}
+EXPORT_SYMBOL(class_process_proc_param);
+#endif
+
+int class_process_proc_seq_param(char *prefix, struct lprocfs_seq_vars *lvars,
+                                struct lustre_cfg *lcfg, void *data)
+{
+#ifdef __KERNEL__
+       struct lprocfs_seq_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;
+
+       if (lcfg->lcfg_command != LCFG_PARAM) {
+               CERROR("Unknown command: %d\n", lcfg->lcfg_command);
+               RETURN(-EINVAL);
        }
-out:
-        RETURN(err);
+
+       /* 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 */
+       for (i = 1; i < lcfg->lcfg_bufcount; i++) {
+               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)) {
+                       CERROR("Can't parse param %s (missing '=')\n", key);
+                       /* rc = -EINVAL;        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, (char *)var->name, 0) == 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);
+                               }
+                               break;
+                       }
+                       j++;
+               }
+               if (!matched) {
+                       CERROR("%.*s: %s unknown param %s\n",
+                              (int)strlen(prefix) - 1, prefix,
+                              (char *)lustre_cfg_string(lcfg, 0), key);
+                       /* rc = -EINVAL;        continue parsing other params */
+                       skip++;
+               } else if (rc < 0) {
+                       CERROR("%s: error writing proc entry '%s': rc = %d\n",
+                              prefix, var->name, rc);
+                       rc = 0;
+               } else {
+                       CDEBUG(D_CONFIG, "%s.%.*s: Set parameter %.*s=%s\n",
+                                        lustre_cfg_string(lcfg, 0),
+                                        (int)strlen(prefix) - 1, prefix,
+                                        (int)(sval - key - 1), key, sval);
+               }
+       }
+
+       if (rc > 0)
+               rc = 0;
+       if (!rc && skip)
+               rc = skip;
+       RETURN(rc);
+#else
+       CDEBUG(D_CONFIG, "liblustre can't process params.\n");
+       /* Don't throw config error */
+       RETURN(0);
+#endif
+}
+EXPORT_SYMBOL(class_process_proc_seq_param);
+
+#ifdef __KERNEL__
+extern int lustre_check_exclusion(struct super_block *sb, char *svname);
+#else
+#define lustre_check_exclusion(a,b)  0
+#endif
+
+/*
+ * Supplemental functions for config logs, it allocates lustre_cfg
+ * buffers plus initialized llog record header at the beginning.
+ */
+struct llog_cfg_rec *lustre_cfg_rec_new(int cmd, struct lustre_cfg_bufs *bufs)
+{
+       struct llog_cfg_rec     *lcr;
+       int                      reclen;
+
+       ENTRY;
+
+       reclen = lustre_cfg_len(bufs->lcfg_bufcount, bufs->lcfg_buflen);
+       reclen = llog_data_len(reclen) + sizeof(struct llog_rec_hdr) +
+                sizeof(struct llog_rec_tail);
+
+       OBD_ALLOC(lcr, reclen);
+       if (lcr == NULL)
+               RETURN(NULL);
+
+       lustre_cfg_init(&lcr->lcr_cfg, cmd, bufs);
+
+       lcr->lcr_hdr.lrh_len = reclen;
+       lcr->lcr_hdr.lrh_type = OBD_CFG_REC;
+
+       RETURN(lcr);
+}
+EXPORT_SYMBOL(lustre_cfg_rec_new);
+
+void lustre_cfg_rec_free(struct llog_cfg_rec *lcr)
+{
+       ENTRY;
+       OBD_FREE(lcr, lcr->lcr_hdr.lrh_len);
+       EXIT;
 }
-           
-static int class_config_llog_handler(struct llog_handle * handle,
-                                     struct llog_rec_hdr *rec, void *data)
+EXPORT_SYMBOL(lustre_cfg_rec_free);
+
+/** 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.
+ */
+int class_config_llog_handler(const struct lu_env *env,
+                             struct llog_handle *handle,
+                             struct llog_rec_hdr *rec, void *data)
 {
-        struct config_llog_instance *cfg = data;
+        struct config_llog_instance *clli = data;
         int cfg_len = rec->lrh_len;
         char *cfg_buf = (char*) (rec + 1);
         int rc = 0;
+        ENTRY;
+
+        //class_config_dump_handler(handle, rec, data);
 
-        if (rec->lrh_type == OBD_CFG_REC) {
-                char *buf;
-                struct lustre_cfg *lcfg;
-                char *old_name = NULL;
-                int old_len = 0;
-                char *old_uuid = NULL;
-                int old_uuid_len = 0;
+        switch (rec->lrh_type) {
+        case OBD_CFG_REC: {
+                struct lustre_cfg *lcfg, *lcfg_new;
+                struct lustre_cfg_bufs bufs;
                 char *inst_name = NULL;
                 int inst_len = 0;
+                int inst = 0, swab = 0;
 
-                rc = lustre_cfg_getdata(&buf, cfg_len, cfg_buf, 1);
-                if (rc) 
+                lcfg = (struct lustre_cfg *)cfg_buf;
+                if (lcfg->lcfg_version == __swab32(LUSTRE_CFG_VERSION)) {
+                        lustre_swab_lustre_cfg(lcfg);
+                        swab = 1;
+                }
+
+                rc = lustre_cfg_sanity_check(cfg_buf, cfg_len);
+                if (rc)
                         GOTO(out, rc);
-                lcfg = (struct lustre_cfg* ) buf;
 
-                if (cfg && cfg->cfg_instance && lcfg->lcfg_dev_name) {
-                        inst_len = strlen(lcfg->lcfg_dev_name) + 
-                                strlen(cfg->cfg_instance) + 2;
-                        OBD_ALLOC(inst_name, inst_len);
-                        if (inst_name == NULL) 
-                                GOTO(out, rc = -ENOMEM);
-                        sprintf(inst_name, "%s-%s", lcfg->lcfg_dev_name, 
-                                cfg->cfg_instance);
-                        old_name = lcfg->lcfg_dev_name;
-                        old_len = lcfg->lcfg_dev_namelen;
-                        lcfg->lcfg_dev_name = inst_name;
-                        lcfg->lcfg_dev_namelen = strlen(inst_name) + 1;
+                /* 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,
+                                               LUSTRE_CFG_BUFLEN(lcfg, 1));
+                        CDEBUG(D_CONFIG, "Marker, inst_flg=%#x mark_flg=%#x\n",
+                               clli->cfg_flags, marker->cm_flags);
+                        if (marker->cm_flags & CM_START) {
+                                /* all previous flags off */
+                                clli->cfg_flags = CFG_F_MARKER;
+                               server_name2index(marker->cm_tgtname,
+                                                 &clli->cfg_lwp_idx, NULL);
+                                if (marker->cm_flags & CM_SKIP) {
+                                        clli->cfg_flags |= CFG_F_SKIP;
+                                        CDEBUG(D_CONFIG, "SKIP #%d\n",
+                                               marker->cm_step);
+                                } else if ((marker->cm_flags & CM_EXCLUDE) ||
+                                           (clli->cfg_sb &&
+                                            lustre_check_exclusion(clli->cfg_sb,
+                                                         marker->cm_tgtname))) {
+                                        clli->cfg_flags |= CFG_F_EXCLUDE;
+                                        CDEBUG(D_CONFIG, "EXCLUDE %d\n",
+                                               marker->cm_step);
+                                }
+                        } else if (marker->cm_flags & CM_END) {
+                                clli->cfg_flags = 0;
+                        }
+                }
+                /* A config command without a start marker before it is
+                   illegal (post 146) */
+                if (!(clli->cfg_flags & CFG_F_COMPAT146) &&
+                    !(clli->cfg_flags & CFG_F_MARKER) &&
+                    (lcfg->lcfg_command != LCFG_MARKER)) {
+                        CWARN("Config not inside markers, ignoring! "
+                              "(inst: %p, uuid: %s, flags: %#x)\n",
+                              clli->cfg_instance,
+                              clli->cfg_uuid.uuid, clli->cfg_flags);
+                        clli->cfg_flags |= CFG_F_SKIP;
+                }
+                if (clli->cfg_flags & CFG_F_SKIP) {
+                        CDEBUG(D_CONFIG, "skipping %#x\n",
+                               clli->cfg_flags);
+                        rc = 0;
+                        /* No processing! */
+                        break;
                 }
-                
-                if (cfg && lcfg->lcfg_command == LCFG_ATTACH) {
-                        old_uuid = lcfg->lcfg_inlbuf2;
-                        old_uuid_len = lcfg->lcfg_inllen2;
 
-                        lcfg->lcfg_inlbuf2 = (char*)&cfg->cfg_uuid.uuid;
-                        lcfg->lcfg_inllen2 = sizeof(cfg->cfg_uuid);
+                /*
+                 * 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);
+
+                        if ((lcfg->lcfg_command == LCFG_ATTACH && typename &&
+                             strcmp(typename, "mds") == 0)) {
+                                CWARN("For 1.8 interoperability, rename obd "
+                                       "type from mds to mdt\n");
+                                typename[2] = 't';
+                        }
+                        if ((lcfg->lcfg_command == LCFG_SETUP && index &&
+                             strcmp(index, "type") == 0)) {
+                                CDEBUG(D_INFO, "For 1.8 interoperability, "
+                                       "set this index to '0'\n");
+                                index[0] = '0';
+                                index[1] = 0;
+                        }
                 }
 
-                rc = class_process_config(lcfg);
+#if defined(HAVE_SERVER_SUPPORT) && defined(__KERNEL__)
+               /* newer MDS replaces LOV/OSC with LOD/OSP */
+               {
+                       char *typename = lustre_cfg_string(lcfg, 1);
+
+                       if ((lcfg->lcfg_command == LCFG_ATTACH && typename &&
+                           strcmp(typename, LUSTRE_LOV_NAME) == 0) &&
+                           IS_MDT(s2lsi(clli->cfg_sb))) {
+                               CDEBUG(D_CONFIG,
+                                      "For 2.x interoperability, rename obd "
+                                      "type from lov to lod (%s)\n",
+                                      s2lsi(clli->cfg_sb)->lsi_svname);
+                               strcpy(typename, LUSTRE_LOD_NAME);
+                       }
+                       if ((lcfg->lcfg_command == LCFG_ATTACH && typename &&
+                           strcmp(typename, LUSTRE_OSC_NAME) == 0) &&
+                           IS_MDT(s2lsi(clli->cfg_sb))) {
+                               CDEBUG(D_CONFIG,
+                                      "For 2.x interoperability, rename obd "
+                                      "type from osc to osp (%s)\n",
+                                      s2lsi(clli->cfg_sb)->lsi_svname);
+                               strcpy(typename, LUSTRE_OSP_NAME);
+                       }
+               }
+#endif
 
-                if (old_name) {
-                        lcfg->lcfg_dev_name = old_name;
-                        lcfg->lcfg_dev_namelen = old_len;
-                        OBD_FREE(inst_name, inst_len);
+               if (clli->cfg_flags & CFG_F_EXCLUDE) {
+                       CDEBUG(D_CONFIG, "cmd: %x marked EXCLUDED\n",
+                              lcfg->lcfg_command);
+                       if (lcfg->lcfg_command == LCFG_LOV_ADD_OBD)
+                               /* Add inactive instead */
+                               lcfg->lcfg_command = LCFG_LOV_ADD_INA;
+               }
+
+                lustre_cfg_bufs_init(&bufs, lcfg);
+
+                if (clli && clli->cfg_instance &&
+                    LUSTRE_CFG_BUFLEN(lcfg, 0) > 0){
+                        inst = 1;
+                        inst_len = LUSTRE_CFG_BUFLEN(lcfg, 0) +
+                                   sizeof(clli->cfg_instance) * 2 + 4;
+                        OBD_ALLOC(inst_name, inst_len);
+                        if (inst_name == NULL)
+                                GOTO(out, rc = -ENOMEM);
+                        sprintf(inst_name, "%s-%p",
+                                lustre_cfg_string(lcfg, 0),
+                                clli->cfg_instance);
+                        lustre_cfg_bufs_set_string(&bufs, 0, inst_name);
+                        CDEBUG(D_CONFIG, "cmd %x, instance name: %s\n",
+                               lcfg->lcfg_command, inst_name);
                 }
-              
-                if (old_uuid) {
-                        lcfg->lcfg_inlbuf2 = old_uuid;
-                        lcfg->lcfg_inllen2 = old_uuid_len;
+
+                /* we override the llog's uuid for clients, to insure they
+                are unique */
+                if (clli && clli->cfg_instance != NULL &&
+                    lcfg->lcfg_command == LCFG_ATTACH) {
+                        lustre_cfg_bufs_set_string(&bufs, 2,
+                                                   clli->cfg_uuid.uuid);
                 }
-                
-                lustre_cfg_freedata(buf, cfg_len);
-        } else if (rec->lrh_type == PTL_CFG_REC) {
-                struct portals_cfg *pcfg = (struct portals_cfg *)cfg_buf;
-                if (pcfg->pcfg_command ==NAL_CMD_REGISTER_MYNID &&
-                    cfg->cfg_local_nid != PTL_NID_ANY) {
-                        pcfg->pcfg_nid = cfg->cfg_local_nid;
+                /*
+                 * 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 (clli && clli->cfg_instance == NULL &&
+                    lcfg->lcfg_command == LCFG_SPTLRPC_CONF) {
+                        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,
+                                                   clli->cfg_obdname);
                 }
 
-                rc = kportal_nal_cmd(pcfg);
+                lcfg_new = lustre_cfg_new(lcfg->lcfg_command, &bufs);
+               if (lcfg_new == NULL)
+                       GOTO(out, rc = -ENOMEM);
+
+                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 */
+                if (lcfg->lcfg_nal != 0 &&      /* pre-newconfig log? */
+                    (lcfg->lcfg_nid >> 32) == 0) {
+                        __u32 addr = (__u32)(lcfg->lcfg_nid & 0xffffffff);
+
+                        lcfg_new->lcfg_nid =
+                                LNET_MKNID(LNET_MKNET(lcfg->lcfg_nal, 0), addr);
+                        CWARN("Converted pre-newconfig NAL %d NID %x to %s\n",
+                              lcfg->lcfg_nal, addr,
+                              libcfs_nid2str(lcfg_new->lcfg_nid));
+                } else {
+                        lcfg_new->lcfg_nid = lcfg->lcfg_nid;
+                }
+
+                lcfg_new->lcfg_nal = 0; /* illegal value for obsolete field */
+
+               rc = class_process_config(lcfg_new);
+                lustre_cfg_free(lcfg_new);
+
+                if (inst)
+                        OBD_FREE(inst_name, inst_len);
+                break;
+        }
+        default:
+                CERROR("Unknown llog record type %#x encountered\n",
+                       rec->lrh_type);
+                break;
         }
 out:
+        if (rc) {
+               CERROR("%s: cfg command failed: rc = %d\n",
+                      handle->lgh_ctxt->loc_obd->obd_name, rc);
+               class_config_dump_handler(NULL, handle, rec, data);
+        }
         RETURN(rc);
 }
+EXPORT_SYMBOL(class_config_llog_handler);
 
-int class_config_parse_llog(struct llog_ctxt *ctxt, char *name, 
-                          struct config_llog_instance *cfg)
+int class_config_parse_llog(const struct lu_env *env, struct llog_ctxt *ctxt,
+                           char *name, struct config_llog_instance *cfg)
 {
-        struct llog_handle *llh;
-        int rc, rc2;
-        ENTRY;
+       struct llog_process_cat_data     cd = {0, 0};
+       struct llog_handle              *llh;
+       llog_cb_t                        callback;
+       int                              rc;
+       ENTRY;
+
+       CDEBUG(D_INFO, "looking up llog %s\n", name);
+       rc = llog_open(env, ctxt, &llh, NULL, name, LLOG_OPEN_EXISTS);
+       if (rc)
+               RETURN(rc);
+
+       rc = llog_init_handle(env, llh, LLOG_F_IS_PLAIN, NULL);
+       if (rc)
+               GOTO(parse_out, rc);
+
+       /* continue processing from where we last stopped to end-of-log */
+       if (cfg) {
+               cd.lpcd_first_idx = cfg->cfg_last_idx;
+               callback = cfg->cfg_callback;
+               LASSERT(callback != NULL);
+       } else {
+               callback = class_config_llog_handler;
+       }
 
-        rc = llog_create(ctxt, &llh, NULL, name);
-        if (rc) 
-                RETURN(rc);
+       cd.lpcd_last_idx = 0;
 
-        rc = llog_init_handle(llh, LLOG_F_IS_PLAIN, NULL);
-        if (rc) 
-                GOTO(parse_out, rc);
+       rc = llog_process(env, llh, callback, cfg, &cd);
 
-        rc = llog_process(llh, class_config_llog_handler, cfg, NULL);
-parse_out:
-        rc2 = llog_close(llh);
-        if (rc == 0)
-                rc = rc2;
+       CDEBUG(D_CONFIG, "Processed log %s gen %d-%d (rc=%d)\n", name,
+              cd.lpcd_first_idx + 1, cd.lpcd_last_idx, rc);
+       if (cfg)
+               cfg->cfg_last_idx = cd.lpcd_last_idx;
 
+parse_out:
+       llog_close(env, llh);
         RETURN(rc);
+}
+EXPORT_SYMBOL(class_config_parse_llog);
+
+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;
 }
 
-static int class_config_dump_handler(struct llog_handle * handle,
-                                     struct llog_rec_hdr *rec, void *data)
+/**
+ * parse config record and output dump in supplied buffer.
+ * This is separated from class_config_dump_handler() to use
+ * for ioctl needs as well
+ *
+ * Sample Output:
+ * - { event: attach, device: lustrewt-clilov, type: lov, UUID:
+ *     lustrewt-clilov_UUID }
+ */
+int class_config_yaml_output(struct llog_rec_hdr *rec, char *buf, int size)
 {
-        int cfg_len = rec->lrh_len;
-        char *cfg_buf = (char*) (rec + 1);
-        int rc = 0;
+       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);
+       if (rc < 0)
+               return rc;
+
+       ldata = lcfg_cmd2data(lcfg->lcfg_command);
+       if (ldata == NULL)
+               return -ENOTTY;
+
+       if (lcfg->lcfg_command == LCFG_MARKER)
+               return 0;
+
+       /* form YAML entity */
+       ptr += snprintf(ptr, end - ptr, "- { event: %s", ldata->ltd_name);
+
+       if (lcfg->lcfg_flags)
+               ptr += snprintf(ptr, end - ptr, ", flags: %#08x",
+                               lcfg->lcfg_flags);
+       if (lcfg->lcfg_num)
+               ptr += snprintf(ptr, end - ptr, ", num: %#08x",
+                               lcfg->lcfg_num);
+       if (lcfg->lcfg_nid)
+               ptr += snprintf(ptr, end - ptr, ", nid: %s("LPX64")",
+                               libcfs_nid2str(lcfg->lcfg_nid),
+                               lcfg->lcfg_nid);
+
+       if (LUSTRE_CFG_BUFLEN(lcfg, 0) > 0)
+               ptr += snprintf(ptr, end - ptr, ", device: %s",
+                               lustre_cfg_string(lcfg, 0));
+
+       for (i = 1; i < lcfg->lcfg_bufcount; i++) {
+               if (LUSTRE_CFG_BUFLEN(lcfg, i) > 0)
+                       ptr += snprintf(ptr, end - ptr, ", %s: %s",
+                                       ldata->ltd_bufs[i - 1],
+                                       lustre_cfg_string(lcfg, i));
+       }
+
+       ptr += snprintf(ptr, end - ptr, " }\n");
+       /* return consumed bytes */
+       rc = ptr - buf;
+       return rc;
+}
+
+/**
+ * parse config record and output dump in supplied buffer.
+ * This is separated from class_config_dump_handler() to use
+ * for ioctl needs as well
+ */
+int class_config_parse_rec(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;
+
+       ENTRY;
+
+       LASSERT(rec->lrh_type == OBD_CFG_REC);
+       rc = lustre_cfg_sanity_check(lcfg, rec->lrh_len);
+       if (rc < 0)
+               RETURN(rc);
+
+       ptr += snprintf(ptr, end-ptr, "cmd=%05x ", lcfg->lcfg_command);
+       if (lcfg->lcfg_flags)
+               ptr += snprintf(ptr, end-ptr, "flags=%#08x ",
+                               lcfg->lcfg_flags);
+
+       if (lcfg->lcfg_num)
+               ptr += snprintf(ptr, end-ptr, "num=%#08x ", lcfg->lcfg_num);
+
+       if (lcfg->lcfg_nid)
+               ptr += snprintf(ptr, end-ptr, "nid=%s("LPX64")\n     ",
+                               libcfs_nid2str(lcfg->lcfg_nid),
+                               lcfg->lcfg_nid);
+
+       if (lcfg->lcfg_command == LCFG_MARKER) {
+               struct cfg_marker *marker = lustre_cfg_buf(lcfg, 1);
+
+               ptr += snprintf(ptr, end-ptr, "marker=%d(%#x)%s '%s'",
+                               marker->cm_step, marker->cm_flags,
+                               marker->cm_tgtname, marker->cm_comment);
+       } else {
+               int i;
+
+               for (i = 0; i <  lcfg->lcfg_bufcount; i++) {
+                       ptr += snprintf(ptr, end-ptr, "%d:%s  ", i,
+                                       lustre_cfg_string(lcfg, i));
+               }
+       }
+       ptr += snprintf(ptr, end - ptr, "\n");
+       /* return consumed bytes */
+       rc = ptr - buf;
+       RETURN(rc);
+}
 
-        if (rec->lrh_type == OBD_CFG_REC) {
-                char *buf;
-                struct lustre_cfg *lcfg;
+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;
 
-                rc = lustre_cfg_getdata(&buf, cfg_len, cfg_buf, 1);
-                if (rc) 
-                        GOTO(out, rc);
-                lcfg = (struct lustre_cfg* ) buf;
-                
-                CDEBUG(D_INFO, "lcfg command: %x\n", lcfg->lcfg_command);
-                if (lcfg->lcfg_dev_name)
-                        CDEBUG(D_INFO, "     devname: %s\n",
-                               lcfg->lcfg_dev_name);
-                if (lcfg->lcfg_flags)
-                        CDEBUG(D_INFO, "       flags: %x\n", lcfg->lcfg_flags);
-                if (lcfg->lcfg_nid)
-                        CDEBUG(D_INFO, "         nid: "LPX64"\n",
-                               lcfg->lcfg_nid);
-                if (lcfg->lcfg_nal)
-                        CDEBUG(D_INFO, "         nal: %x\n", lcfg->lcfg_nal);
-                if (lcfg->lcfg_num)
-                        CDEBUG(D_INFO, "         nal: %x\n", lcfg->lcfg_num);
-                if (lcfg->lcfg_inlbuf1)
-                        CDEBUG(D_INFO, "     inlbuf1: %s\n",lcfg->lcfg_inlbuf1);
-                if (lcfg->lcfg_inlbuf2)
-                        CDEBUG(D_INFO, "     inlbuf1: %s\n",lcfg->lcfg_inlbuf2);
-                if (lcfg->lcfg_inlbuf3)
-                        CDEBUG(D_INFO, "     inlbuf1: %s\n",lcfg->lcfg_inlbuf3);
-                if (lcfg->lcfg_inlbuf4)
-                        CDEBUG(D_INFO, "     inlbuf1: %s\n",lcfg->lcfg_inlbuf4);
-
-                lustre_cfg_freedata(buf, cfg_len);
-        } else if (rec->lrh_type == PTL_CFG_REC) {
-                struct portals_cfg *pcfg = (struct portals_cfg *)cfg_buf;
-
-                CDEBUG(D_INFO, "pcfg command: %d\n", pcfg->pcfg_command);
-                if (pcfg->pcfg_nal)
-                        CDEBUG(D_INFO, "         nal: %d\n",
-                               pcfg->pcfg_nal);
-                if (pcfg->pcfg_gw_nal)
-                        CDEBUG(D_INFO, "      gw_nal: %d\n",
-                               pcfg->pcfg_gw_nal);
-                if (pcfg->pcfg_nid)
-                        CDEBUG(D_INFO, "         nid: "LPX64"\n",
-                               pcfg->pcfg_nid);
-                if (pcfg->pcfg_nid2)
-                        CDEBUG(D_INFO, "         nid: "LPX64"\n",
-                               pcfg->pcfg_nid2);
-                if (pcfg->pcfg_nid3)
-                        CDEBUG(D_INFO, "         nid: "LPX64"\n",
-                               pcfg->pcfg_nid3);
-                if (pcfg->pcfg_misc)
-                        CDEBUG(D_INFO, "         nid: %d\n",
-                               pcfg->pcfg_misc);
-                if (pcfg->pcfg_id)
-                        CDEBUG(D_INFO, "          id: %x\n",
-                               pcfg->pcfg_id);
-                if (pcfg->pcfg_flags)
-                        CDEBUG(D_INFO, "       flags: %x\n",
-                               pcfg->pcfg_flags);
+       ENTRY;
+
+       OBD_ALLOC(outstr, 256);
+       if (outstr == NULL)
+               RETURN(-ENOMEM);
+
+       if (rec->lrh_type == OBD_CFG_REC) {
+               class_config_parse_rec(rec, outstr, 256);
+               LCONSOLE(D_WARNING, "   %s\n", outstr);
+       } else {
+               LCONSOLE(D_WARNING, "unhandled lrh_type: %#x\n", rec->lrh_type);
+               rc = -EINVAL;
+       }
+
+       OBD_FREE(outstr, 256);
+       RETURN(rc);
+}
+
+int class_config_dump_llog(const struct lu_env *env, struct llog_ctxt *ctxt,
+                          char *name, struct config_llog_instance *cfg)
+{
+       struct llog_handle      *llh;
+       int                      rc;
+
+       ENTRY;
+
+       LCONSOLE_INFO("Dumping config log %s\n", name);
+
+       rc = llog_open(env, ctxt, &llh, NULL, name, LLOG_OPEN_EXISTS);
+       if (rc)
+               RETURN(rc);
+
+       rc = llog_init_handle(env, llh, LLOG_F_IS_PLAIN, NULL);
+       if (rc)
+               GOTO(parse_out, rc);
+
+       rc = llog_process(env, llh, class_config_dump_handler, cfg, NULL);
+parse_out:
+       llog_close(env, llh);
+
+       LCONSOLE_INFO("End config log %s\n", name);
+       RETURN(rc);
+}
+EXPORT_SYMBOL(class_config_dump_llog);
+
+/** 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;
+
+        if (!obd) {
+                CERROR("empty cleanup\n");
+                RETURN(-EALREADY);
+        }
+
+        if (obd->obd_force)
+                strcat(flags, "F");
+        if (obd->obd_fail)
+                strcat(flags, "A");
+
+        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);
+        lcfg = lustre_cfg_new(LCFG_CLEANUP, &bufs);
+        if (!lcfg)
+                RETURN(-ENOMEM);
+
+        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:
+        lustre_cfg_free(lcfg);
         RETURN(rc);
 }
+EXPORT_SYMBOL(class_manual_cleanup);
+
+/*
+ * uuid<->export lustre hash operations
+ */
 
-int class_config_dump_llog(struct llog_ctxt *ctxt, char *name, 
-                          struct config_llog_instance *cfg)
+static unsigned
+uuid_hash(cfs_hash_t *hs, const void *key, unsigned mask)
 {
-        struct llog_handle *llh;
-        int rc, rc2;
-        ENTRY;
+        return cfs_hash_djb2_hash(((struct obd_uuid *)key)->uuid,
+                                  sizeof(((struct obd_uuid *)key)->uuid), mask);
+}
 
-        rc = llog_create(ctxt, &llh, NULL, name);
-        if (rc) 
-                RETURN(rc);
+static void *
+uuid_key(struct hlist_node *hnode)
+{
+       struct obd_export *exp;
 
-        rc = llog_init_handle(llh, LLOG_F_IS_PLAIN, NULL);
-        if (rc) 
-                GOTO(parse_out, rc);
+       exp = hlist_entry(hnode, struct obd_export, exp_uuid_hash);
 
-        rc = llog_process(llh, class_config_dump_handler, cfg, NULL);
-parse_out:
-        rc2 = llog_close(llh);
-        if (rc == 0)
-                rc = rc2;
+       return &exp->exp_client_uuid;
+}
 
-        RETURN(rc);
+/*
+ * 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(cfs_hash_t *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(cfs_hash_t *hs, struct hlist_node *hnode)
+{
+        struct obd_export *exp;
+
+       exp = hlist_entry(hnode, struct obd_export, exp_uuid_hash);
+        class_export_put(exp);
+}
+
+static cfs_hash_ops_t 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
+ */
+
+static unsigned
+nid_hash(cfs_hash_t *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(cfs_hash_t *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(cfs_hash_t *hs, struct hlist_node *hnode)
+{
+        struct obd_export *exp;
+
+       exp = hlist_entry(hnode, struct obd_export, exp_nid_hash);
+        class_export_put(exp);
+}
+
+static cfs_hash_ops_t 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;
+
+       ns = hlist_entry(hnode, struct nid_stat, nid_hash);
+
+        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;
+}
+
+static void *
+nidstats_object(struct hlist_node *hnode)
+{
+       return hlist_entry(hnode, struct nid_stat, nid_hash);
+}
+
+static void
+nidstats_get(cfs_hash_t *hs, struct hlist_node *hnode)
+{
+        struct nid_stat *ns;
+
+       ns = hlist_entry(hnode, struct nid_stat, nid_hash);
+        nidstat_getref(ns);
+}
+
+static void
+nidstats_put_locked(cfs_hash_t *hs, struct hlist_node *hnode)
+{
+        struct nid_stat *ns;
 
+       ns = hlist_entry(hnode, struct nid_stat, nid_hash);
+        nidstat_putref(ns);
 }
 
+static cfs_hash_ops_t 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,
+};