Whamcloud - gitweb
LU-8359 ldlm: Wrong evict during failover
[fs/lustre-release.git] / lustre / include / obd_class.h
index 331a9e6..0fafed0 100644 (file)
  *
  * 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
- *
- * 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.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -36,9 +32,6 @@
 #ifndef __CLASS_OBD_H
 #define __CLASS_OBD_H
 
-#ifndef __KERNEL__
-# include <liblustre.h>
-#endif
 
 #include <obd_support.h>
 #include <lustre_import.h>
 #include <lustre/lustre_idl.h>
 #include <lprocfs_status.h>
 
-#if defined(__linux__)
-#include <linux/obd_class.h>
-#elif defined(__APPLE__)
-#include <darwin/obd_class.h>
-#elif defined(__WINNT__)
-#include <winnt/obd_class.h>
-#else
-#error Unsupported operating system.
-#endif
-
 #define OBD_STATFS_NODELAY      0x0001  /* requests should be send without delay
                                          * and resends for avoid deadlocks */
 #define OBD_STATFS_FROM_CACHE   0x0002  /* the statfs callback should not update
                                          * obd_osfs_age */
-#define OBD_STATFS_PTLRPCD      0x0004  /* requests will be sent via ptlrpcd
-                                         * instead of a specific set. This
-                                         * means that we cannot rely on the set
-                                         * interpret routine to be called.
-                                         * lov_statfs_fini() must thus be called
-                                         * by the request interpret routine */
-#define OBD_STATFS_FOR_MDT0    0x0008  /* The statfs is only for retrieving
+#define OBD_STATFS_FOR_MDT0    0x0004  /* The statfs is only for retrieving
                                         * information from MDT0. */
 
-/* OBD Device Declarations */
-extern struct obd_device *obd_devs[MAX_OBD_DEVICES];
 extern rwlock_t obd_dev_lock;
 
 /* OBD Operations Declarations */
@@ -86,10 +61,7 @@ struct lu_device_type;
 /* genops.c */
 struct obd_export *class_conn2export(struct lustre_handle *);
 int class_register_type(struct obd_ops *, struct md_ops *, bool enable_proc,
-                       struct lprocfs_seq_vars *module_vars,
-#ifndef HAVE_ONLY_PROCFS_SEQ
-                       struct lprocfs_vars *,
-#endif
+                       struct lprocfs_vars *module_vars,
                        const char *nm, struct lu_device_type *ldt);
 int class_unregister_type(const char *nm);
 
@@ -115,7 +87,8 @@ char *obd_export_nid2str(struct obd_export *exp);
 
 int obd_export_evict_by_nid(struct obd_device *obd, const char *nid);
 int obd_export_evict_by_uuid(struct obd_device *obd, const char *uuid);
-int obd_connect_flags2str(char *page, int count, __u64 flags, char *sep);
+int obd_connect_flags2str(char *page, int count, __u64 flags, __u64 flags2,
+                         const char *sep);
 
 int obd_zombie_impexp_init(void);
 void obd_zombie_impexp_stop(void);
@@ -124,28 +97,36 @@ void obd_zombie_barrier(void);
 void obd_exports_barrier(struct obd_device *obd);
 int kuc_len(int payload_len);
 struct kuc_hdr * kuc_ptr(void *p);
-int kuc_ispayload(void *p);
 void *kuc_alloc(int payload_len, int transport, int type);
 void kuc_free(void *p, int payload_len);
 int obd_get_request_slot(struct client_obd *cli);
 void obd_put_request_slot(struct client_obd *cli);
 __u32 obd_get_max_rpcs_in_flight(struct client_obd *cli);
 int obd_set_max_rpcs_in_flight(struct client_obd *cli, __u32 max);
+__u16 obd_get_max_mod_rpcs_in_flight(struct client_obd *cli);
+int obd_set_max_mod_rpcs_in_flight(struct client_obd *cli, __u16 max);
+int obd_mod_rpc_stats_seq_show(struct client_obd *cli, struct seq_file *seq);
+
+__u16 obd_get_mod_rpc_slot(struct client_obd *cli, __u32 opc,
+                          struct lookup_intent *it);
+void obd_put_mod_rpc_slot(struct client_obd *cli, __u32 opc,
+                         struct lookup_intent *it, __u16 tag);
 
 struct llog_handle;
 struct llog_rec_hdr;
 typedef int (*llog_cb_t)(const struct lu_env *, struct llog_handle *,
                         struct llog_rec_hdr *, void *);
+
+struct obd_export *obd_stale_export_get(void);
+void obd_stale_export_put(struct obd_export *exp);
+void obd_stale_export_adjust(struct obd_export *exp);
+
 /* obd_config.c */
 struct lustre_cfg *lustre_cfg_rename(struct lustre_cfg *cfg,
                                     const char *new_name);
 int class_process_config(struct lustre_cfg *lcfg);
-#ifndef HAVE_ONLY_PROCFS_SEQ
 int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars,
-                             struct lustre_cfg *lcfg, void *data);
-#endif
-int class_process_proc_seq_param(char *prefix, struct lprocfs_seq_vars *lvars,
-                                struct lustre_cfg *lcfg, void *data);
+                            struct lustre_cfg *lcfg, void *data);
 int class_attach(struct lustre_cfg *lcfg);
 int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg);
 int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg);
@@ -154,12 +135,11 @@ struct obd_device *class_incref(struct obd_device *obd,
                                 const char *scope, const void *source);
 void class_decref(struct obd_device *obd,
                   const char *scope, const void *source);
-void dump_exports(struct obd_device *obd, int locks);
+void dump_exports(struct obd_device *obd, int locks, int debug_level);
 int class_config_llog_handler(const struct lu_env *env,
                              struct llog_handle *handle,
                              struct llog_rec_hdr *rec, void *data);
 int class_add_conn(struct obd_device *obd, struct lustre_cfg *lcfg);
-int class_add_uuid(const char *uuid, __u64 nid);
 
 #define CFG_F_START     0x01   /* Set when we start updating from a log */
 #define CFG_F_MARKER    0x02   /* We are within a maker */
@@ -172,57 +152,81 @@ struct config_llog_instance {
        char                    *cfg_obdname;
        void                    *cfg_instance;
        struct super_block      *cfg_sb;
-       struct obd_uuid          cfg_uuid;
+       struct obd_uuid          cfg_uuid;
        llog_cb_t                cfg_callback;
        int                      cfg_last_idx; /* for partial llog processing */
        int                      cfg_flags;
        __u32                    cfg_lwp_idx;
+       __u32                    cfg_sub_clds;
 };
 int class_config_parse_llog(const struct lu_env *env, struct llog_ctxt *ctxt,
                            char *name, struct config_llog_instance *cfg);
-int class_config_dump_llog(const struct lu_env *env, struct llog_ctxt *ctxt,
-                          char *name, struct config_llog_instance *cfg);
-
-enum {
-       CONFIG_T_CONFIG  = 0,
-       CONFIG_T_SPTLRPC = 1,
-       CONFIG_T_RECOVER = 2,
-       CONFIG_T_PARAMS  = 3,
-       CONFIG_T_MAX     = 4
-};
 
-#define PARAMS_FILENAME        "params"
-#define LCTL_UPCALL    "lctl"
+#define CONFIG_SUB_SPTLRPC     0x01
+#define CONFIG_SUB_RECOVER     0x02
+#define CONFIG_SUB_PARAMS      0x04
+#define CONFIG_SUB_NODEMAP     0x08
+#define CONFIG_SUB_BARRIER     0x10
+
+/* Sub clds should be attached to the config_llog_data when processing
+ * config log for client or server target. */
+#define CONFIG_SUB_CLIENT      (CONFIG_SUB_SPTLRPC | CONFIG_SUB_RECOVER | \
+                                CONFIG_SUB_PARAMS)
+#define CONFIG_SUB_SERVER      (CONFIG_SUB_CLIENT | CONFIG_SUB_NODEMAP | \
+                                CONFIG_SUB_BARRIER)
+
+#define PARAMS_FILENAME                "params"
+#define BARRIER_FILENAME       "barrier"
+#define LCTL_UPCALL            "lctl"
+
+static inline bool logname_is_barrier(const char *logname)
+{
+       char *ptr;
+
+       /* logname for barrier is "fsname-barrier" */
+       ptr = strstr(logname, BARRIER_FILENAME);
+       if (ptr && (ptr - logname) >= 2 &&
+           *(ptr - 1) == '-' && *(ptr + 7) == '\0')
+               return true;
+
+       return false;
+}
 
 /* list of active configuration logs  */
 struct config_llog_data {
-        struct ldlm_res_id          cld_resid;
-        struct config_llog_instance cld_cfg;
-        cfs_list_t                  cld_list_chain;
+       struct ldlm_res_id          cld_resid;
+       struct config_llog_instance cld_cfg;
+       struct list_head            cld_list_chain;
        atomic_t                    cld_refcount;
        struct config_llog_data    *cld_sptlrpc;/* depended sptlrpc log */
-       struct config_llog_data    *cld_params; /* common parameters log */
+       struct config_llog_data    *cld_params; /* common parameters log */
        struct config_llog_data    *cld_recover;/* imperative recover log */
-        struct obd_export          *cld_mgcexp;
+       struct config_llog_data    *cld_nodemap;/* nodemap log */
+       struct config_llog_data    *cld_barrier;/* barrier log (for MDT only) */
+       struct obd_export          *cld_mgcexp;
        struct mutex                cld_lock;
-        int                         cld_type;
-        unsigned int                cld_stopping:1, /* we were told to stop
-                                                     * watching */
-                                    cld_lostlock:1; /* lock not requeued */
-        char                        cld_logname[0];
+       int                         cld_type;
+       unsigned int                cld_stopping:1, /* we were told to stop
+                                                    * watching */
+                                   cld_lostlock:1; /* lock not requeued */
+       char                        cld_logname[0];
 };
 
 struct lustre_profile {
-        cfs_list_t       lp_list;
-        char            *lp_profile;
-        char            *lp_dt;
-        char            *lp_md;
+       struct list_head         lp_list;
+       char                    *lp_profile;
+       char                    *lp_dt;
+       char                    *lp_md;
+       int                      lp_refs;
+       bool                     lp_list_deleted;
 };
 
 struct lustre_profile *class_get_profile(const char * prof);
 void class_del_profile(const char *prof);
+void class_put_profile(struct lustre_profile *lprof);
 void class_del_profiles(void);
 
+
 #if LUSTRE_TRACKS_LOCK_EXP_REFS
 
 void __class_export_add_lock_ref(struct obd_export *, struct ldlm_lock *);
@@ -313,8 +317,7 @@ void class_disconnect_stale_exports(struct obd_device *,
                                     int (*test_export)(struct obd_export *));
 static inline enum obd_option exp_flags_from_obd(struct obd_device *obd)
 {
-        return ((obd->obd_fail ? OBD_OPT_FAILOVER : 0) |
-                (obd->obd_force ? OBD_OPT_FORCE : 0) |
+        return ((obd->obd_force ? OBD_OPT_FORCE : 0) |
                 (obd->obd_abort_recovery ? OBD_OPT_ABORT_RECOV : 0) |
                 0);
 }
@@ -323,6 +326,8 @@ static inline enum obd_option exp_flags_from_obd(struct obd_device *obd)
 static inline struct lu_target *class_exp2tgt(struct obd_export *exp)
 {
         LASSERT(exp->exp_obd);
+       if (exp->exp_obd->u.obt.obt_magic != OBT_MAGIC)
+               return NULL;
         return exp->exp_obd->u.obt.obt_lut;
 }
 
@@ -333,10 +338,15 @@ static inline struct lr_server_data *class_server_data(struct obd_device *obd)
 }
 #endif
 
-void obdo_cpy_md(struct obdo *dst, const struct obdo *src, obd_flag valid);
+/* obdo.c */
+struct lu_attr;
+struct inode;
+
+void obdo_from_la(struct obdo *dst, const struct lu_attr *la, u64 valid);
+void la_from_obdo(struct lu_attr *la, const struct obdo *dst, u64 valid);
+
+void obdo_cpy_md(struct obdo *dst, const struct obdo *src, u64 valid);
 void obdo_to_ioobj(const struct obdo *oa, struct obd_ioobj *ioobj);
-void md_from_obdo(struct md_op_data *op_data, const struct obdo *oa,
-                 obd_flag valid);
 
 #define OBT(dev)        (dev)->obd_type
 #define OBP(dev, op)    (dev)->obd_type->typ_dt_ops->o_ ## op
@@ -365,7 +375,7 @@ do {                                                            \
 } while (0)
 
 
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
 #define OBD_COUNTER_OFFSET(op)                                                \
        ((offsetof(struct obd_ops, o_ ## op) -                                 \
          offsetof(struct obd_ops, o_iocontrol))                               \
@@ -422,99 +432,95 @@ do {                                                            \
 
 static inline int lprocfs_nid_ldlm_stats_init(struct nid_stat* tmp)
 {
-        /* Always add in ldlm_stats */
-        tmp->nid_ldlm_stats = lprocfs_alloc_stats(LDLM_LAST_OPC - LDLM_FIRST_OPC
-                                                  ,LPROCFS_STATS_FLAG_NOPERCPU);
-        if (tmp->nid_ldlm_stats == NULL)
-                return -ENOMEM;
-
-        lprocfs_init_ldlm_stats(tmp->nid_ldlm_stats);
-
-        return lprocfs_register_stats(tmp->nid_proc, "ldlm_stats",
-                                      tmp->nid_ldlm_stats);
-}
-
-#define EXP_CHECK_MD_OP(exp, op)                                \
-do {                                                            \
-        if ((exp) == NULL) {                                    \
-                CERROR("obd_" #op ": NULL export\n");           \
-                RETURN(-ENODEV);                                \
-        }                                                       \
-        if ((exp)->exp_obd == NULL || !OBT((exp)->exp_obd)) {   \
-                CERROR("obd_" #op ": cleaned up obd\n");        \
-                RETURN(-EOPNOTSUPP);                            \
-        }                                                       \
-        if (!OBT((exp)->exp_obd) || !MDP((exp)->exp_obd, op)) { \
-                CERROR("obd_" #op ": dev %s/%d no operation\n", \
-                       (exp)->exp_obd->obd_name,                \
-                       (exp)->exp_obd->obd_minor);              \
-                RETURN(-EOPNOTSUPP);                            \
-        }                                                       \
+       /* Always add in ldlm_stats */
+       tmp->nid_ldlm_stats =
+               lprocfs_alloc_stats(LDLM_LAST_OPC - LDLM_FIRST_OPC,
+                                   LPROCFS_STATS_FLAG_NOPERCPU);
+       if (tmp->nid_ldlm_stats == NULL)
+               return -ENOMEM;
+
+       lprocfs_init_ldlm_stats(tmp->nid_ldlm_stats);
+
+       return lprocfs_register_stats(tmp->nid_proc, "ldlm_stats",
+                                     tmp->nid_ldlm_stats);
+}
+
+#define EXP_CHECK_MD_OP(exp, op)                                       \
+do {                                                                   \
+       if ((exp) == NULL) {                                            \
+               CERROR("obd_" #op ": NULL export\n");                   \
+               RETURN(-ENODEV);                                        \
+       }                                                               \
+       if ((exp)->exp_obd == NULL || !OBT((exp)->exp_obd)) {           \
+               CERROR("obd_" #op ": cleaned up obd\n");                \
+               RETURN(-EOPNOTSUPP);                                    \
+       }                                                               \
+       if (!OBT((exp)->exp_obd) || !MDP((exp)->exp_obd, op)) {         \
+               CERROR("%s: obd_" #op ": dev %d no operation\n",        \
+                      (exp)->exp_obd->obd_name,                        \
+                      (exp)->exp_obd->obd_minor);                      \
+               RETURN(-EOPNOTSUPP);                                    \
+       }                                                               \
 } while (0)
 
 
-#define OBD_CHECK_DT_OP(obd, op, err)                           \
-do {                                                            \
-        if (!OBT(obd) || !OBP((obd), op)) {                     \
-                if (err)                                        \
-                        CERROR("obd_" #op ": dev %d no operation\n",    \
-                               obd->obd_minor);                 \
-                RETURN(err);                                    \
-        }                                                       \
+#define OBD_CHECK_DT_OP(obd, op, err)                                  \
+do {                                                                   \
+       if (!OBT(obd) || !OBP((obd), op)) {                             \
+               if (err)                                                \
+                       CERROR("%s: no obd_" #op " operation\n",        \
+                              obd->obd_name);                          \
+               RETURN(err);                                            \
+       }                                                               \
 } while (0)
 
-#define EXP_CHECK_DT_OP(exp, op)                                \
-do {                                                            \
-        if ((exp) == NULL) {                                    \
-                CERROR("obd_" #op ": NULL export\n");           \
-                RETURN(-ENODEV);                                \
-        }                                                       \
-        if ((exp)->exp_obd == NULL || !OBT((exp)->exp_obd)) {   \
-                CERROR("obd_" #op ": cleaned up obd\n");        \
-                RETURN(-EOPNOTSUPP);                            \
-        }                                                       \
-        if (!OBT((exp)->exp_obd) || !OBP((exp)->exp_obd, op)) { \
-                CERROR("obd_" #op ": dev %d no operation\n",    \
-                       (exp)->exp_obd->obd_minor);              \
-                RETURN(-EOPNOTSUPP);                            \
-        }                                                       \
+#define EXP_CHECK_DT_OP(exp, op)                                       \
+do {                                                                   \
+       if ((exp) == NULL) {                                            \
+               CERROR("obd_" #op ": NULL export\n");                   \
+               RETURN(-ENODEV);                                        \
+       }                                                               \
+       if ((exp)->exp_obd == NULL || !OBT((exp)->exp_obd)) {           \
+               CERROR("obd_" #op ": cleaned up obd\n");                \
+               RETURN(-EOPNOTSUPP);                                    \
+       }                                                               \
+       OBD_CHECK_DT_OP((exp)->exp_obd, op, -EOPNOTSUPP);               \
 } while (0)
 
-#define CTXT_CHECK_OP(ctxt, op, err)                                 \
-do {                                                                 \
-        if (!OBT(ctxt->loc_obd) || !CTXTP((ctxt), op)) {             \
-                if (err)                                             \
-                        CERROR("lop_" #op ": dev %d no operation\n", \
-                               ctxt->loc_obd->obd_minor);            \
-                RETURN(err);                                         \
-        }                                                            \
+#define CTXT_CHECK_OP(ctxt, op, err)                                   \
+do {                                                                   \
+       if (!OBT(ctxt->loc_obd) || !CTXTP((ctxt), op)) {                \
+               if (err)                                                \
+                       CERROR("%s: no lop_" #op "operation\n",         \
+                              ctxt->loc_obd->obd_name);                \
+               RETURN(err);                                            \
+       }                                                               \
 } while (0)
 
 static inline int class_devno_max(void)
 {
-        return MAX_OBD_DEVICES;
+       return MAX_OBD_DEVICES;
 }
 
-static inline int obd_get_info(const struct lu_env *env,
-                               struct obd_export *exp, __u32 keylen,
-                               void *key, __u32 *vallen, void *val,
-                               struct lov_stripe_md *lsm)
+static inline int obd_get_info(const struct lu_env *env, struct obd_export *exp,
+                              __u32 keylen, void *key,
+                              __u32 *vallen, void *val)
 {
-        int rc;
-        ENTRY;
+       int rc;
+       ENTRY;
 
-        EXP_CHECK_DT_OP(exp, get_info);
-        EXP_COUNTER_INCREMENT(exp, get_info);
+       EXP_CHECK_DT_OP(exp, get_info);
+       EXP_COUNTER_INCREMENT(exp, get_info);
 
-        rc = OBP(exp->exp_obd, get_info)(env, exp, keylen, key, vallen, val,
-                                         lsm);
-        RETURN(rc);
+       rc = OBP(exp->exp_obd, get_info)(env, exp, keylen, key, vallen, val);
+       RETURN(rc);
 }
 
 static inline int obd_set_info_async(const struct lu_env *env,
-                                     struct obd_export *exp, obd_count keylen,
-                                     void *key, obd_count vallen, void *val,
-                                     struct ptlrpc_request_set *set)
+                                    struct obd_export *exp,
+                                    __u32 keylen, void *key,
+                                    __u32 vallen, void *val,
+                                    struct ptlrpc_request_set *set)
 {
         int rc;
         ENTRY;
@@ -586,32 +592,29 @@ static inline int obd_setup(struct obd_device *obd, struct lustre_cfg *cfg)
         RETURN(rc);
 }
 
-static inline int obd_precleanup(struct obd_device *obd,
-                                 enum obd_cleanup_stage cleanup_stage)
+static inline int obd_precleanup(struct obd_device *obd)
 {
-        int rc;
-        DECLARE_LU_VARS(ldt, d);
-        ENTRY;
+       int rc;
+       DECLARE_LU_VARS(ldt, d);
+       ENTRY;
 
-        OBD_CHECK_DEV(obd);
-        ldt = obd->obd_type->typ_lu;
-        d = obd->obd_lu_dev;
-        if (ldt != NULL && d != NULL) {
-                if (cleanup_stage == OBD_CLEANUP_EXPORTS) {
-                        struct lu_env env;
-
-                        rc = lu_env_init(&env, ldt->ldt_ctx_tags);
-                        if (rc == 0) {
-                                ldt->ldt_ops->ldto_device_fini(&env, d);
-                                lu_env_fini(&env);
-                        }
-                }
-        }
-        OBD_CHECK_DT_OP(obd, precleanup, 0);
-        OBD_COUNTER_INCREMENT(obd, precleanup);
+       OBD_CHECK_DEV(obd);
+       ldt = obd->obd_type->typ_lu;
+       d = obd->obd_lu_dev;
+       if (ldt != NULL && d != NULL) {
+               struct lu_env env;
 
-        rc = OBP(obd, precleanup)(obd, cleanup_stage);
-        RETURN(rc);
+               rc = lu_env_init(&env, ldt->ldt_ctx_tags);
+               if (rc == 0) {
+                       ldt->ldt_ops->ldto_device_fini(&env, d);
+                       lu_env_fini(&env);
+               }
+       }
+       OBD_CHECK_DT_OP(obd, precleanup, 0);
+       OBD_COUNTER_INCREMENT(obd, precleanup);
+
+       rc = OBP(obd, precleanup)(obd);
+       RETURN(rc);
 }
 
 static inline int obd_cleanup(struct obd_device *obd)
@@ -654,10 +657,6 @@ static inline void obd_cleanup_client_import(struct obd_device *obd)
                 CDEBUG(D_CONFIG, "%s: client import never connected\n",
                        obd->obd_name);
                 ptlrpc_invalidate_import(imp);
-                if (imp->imp_rq_pool) {
-                        ptlrpc_free_rq_pool(imp->imp_rq_pool);
-                        imp->imp_rq_pool = NULL;
-                }
                 client_destroy_import(imp);
                 obd->u.cli.cl_import = NULL;
         }
@@ -696,202 +695,56 @@ obd_process_config(struct obd_device *obd, int datalen, void *data)
         RETURN(rc);
 }
 
-/* Pack an in-memory MD struct for storage on disk.
- * Returns +ve size of packed MD (0 for free), or -ve error.
- *
- * If @disk_tgt == NULL, MD size is returned (max size if @mem_src == NULL).
- * If @*disk_tgt != NULL and @mem_src == NULL, @*disk_tgt will be freed.
- * If @*disk_tgt == NULL, it will be allocated
- */
-static inline int obd_packmd(struct obd_export *exp,
-                             struct lov_mds_md **disk_tgt,
-                             struct lov_stripe_md *mem_src)
-{
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, packmd);
-        EXP_COUNTER_INCREMENT(exp, packmd);
-
-        rc = OBP(exp->exp_obd, packmd)(exp, disk_tgt, mem_src);
-        RETURN(rc);
-}
-
-static inline int obd_size_diskmd(struct obd_export *exp,
-                                  struct lov_stripe_md *mem_src)
-{
-        return obd_packmd(exp, NULL, mem_src);
-}
-
-static inline int obd_free_diskmd(struct obd_export *exp,
-                                 struct lov_mds_md **disk_tgt)
-{
-       LASSERT(disk_tgt);
-       LASSERT(*disk_tgt);
-       /*
-        * LU-2590, for caller's convenience, *disk_tgt could be host
-        * endianness, it needs swab to LE if necessary, while just
-        * lov_mds_md header needs it for figuring out how much memory
-        * needs to be freed.
-        */
-       if ((cpu_to_le32(LOV_MAGIC) != LOV_MAGIC) &&
-           (((*disk_tgt)->lmm_magic == LOV_MAGIC_V1) ||
-            ((*disk_tgt)->lmm_magic == LOV_MAGIC_V3)))
-               lustre_swab_lov_mds_md(*disk_tgt);
-       return obd_packmd(exp, disk_tgt, NULL);
-}
-
-/* Unpack an MD struct from disk to in-memory format.
- * Returns +ve size of unpacked MD (0 for free), or -ve error.
- *
- * If @mem_tgt == NULL, MD size is returned (max size if @disk_src == NULL).
- * If @*mem_tgt != NULL and @disk_src == NULL, @*mem_tgt will be freed.
- * If @*mem_tgt == NULL, it will be allocated
- */
-static inline int obd_unpackmd(struct obd_export *exp,
-                               struct lov_stripe_md **mem_tgt,
-                               struct lov_mds_md *disk_src,
-                               int disk_len)
-{
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, unpackmd);
-        EXP_COUNTER_INCREMENT(exp, unpackmd);
-
-        rc = OBP(exp->exp_obd, unpackmd)(exp, mem_tgt, disk_src, disk_len);
-        RETURN(rc);
-}
-
-/* helper functions */
-static inline int obd_alloc_memmd(struct obd_export *exp,
-                                  struct lov_stripe_md **mem_tgt)
-{
-        LASSERT(mem_tgt);
-        LASSERT(*mem_tgt == NULL);
-        return obd_unpackmd(exp, mem_tgt, NULL, 0);
-}
-
-static inline int obd_free_memmd(struct obd_export *exp,
-                                 struct lov_stripe_md **mem_tgt)
-{
-        int rc;
-
-        LASSERT(mem_tgt);
-        LASSERT(*mem_tgt);
-        rc = obd_unpackmd(exp, mem_tgt, NULL, 0);
-        *mem_tgt = NULL;
-        return rc;
-}
-
 static inline int obd_create(const struct lu_env *env, struct obd_export *exp,
-                             struct obdo *obdo, struct lov_stripe_md **ea,
-                             struct obd_trans_info *oti)
+                            struct obdo *obdo)
 {
-        int rc;
-        ENTRY;
+       int rc;
+       ENTRY;
 
-        EXP_CHECK_DT_OP(exp, create);
-        EXP_COUNTER_INCREMENT(exp, create);
+       EXP_CHECK_DT_OP(exp, create);
+       EXP_COUNTER_INCREMENT(exp, create);
 
-        rc = OBP(exp->exp_obd, create)(env, exp, obdo, ea, oti);
-        RETURN(rc);
+       rc = OBP(exp->exp_obd, create)(env, exp, obdo);
+       RETURN(rc);
 }
 
 static inline int obd_destroy(const struct lu_env *env, struct obd_export *exp,
-                              struct obdo *obdo, struct lov_stripe_md *ea,
-                              struct obd_trans_info *oti,
-                              struct obd_export *md_exp, void *capa)
+                             struct obdo *obdo)
 {
-        int rc;
-        ENTRY;
+       int rc;
+       ENTRY;
 
-        EXP_CHECK_DT_OP(exp, destroy);
-        EXP_COUNTER_INCREMENT(exp, destroy);
+       EXP_CHECK_DT_OP(exp, destroy);
+       EXP_COUNTER_INCREMENT(exp, destroy);
 
-        rc = OBP(exp->exp_obd, destroy)(env, exp, obdo, ea, oti, md_exp, capa);
-        RETURN(rc);
+       rc = OBP(exp->exp_obd, destroy)(env, exp, obdo);
+       RETURN(rc);
 }
 
 static inline int obd_getattr(const struct lu_env *env, struct obd_export *exp,
-                              struct obd_info *oinfo)
-{
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, getattr);
-        EXP_COUNTER_INCREMENT(exp, getattr);
-
-        rc = OBP(exp->exp_obd, getattr)(env, exp, oinfo);
-        RETURN(rc);
-}
-
-static inline int obd_getattr_async(struct obd_export *exp,
-                                    struct obd_info *oinfo,
-                                    struct ptlrpc_request_set *set)
+                             struct obdo *oa)
 {
-        int rc;
-        ENTRY;
+       int rc;
 
-        EXP_CHECK_DT_OP(exp, getattr_async);
-        EXP_COUNTER_INCREMENT(exp, getattr_async);
+       ENTRY;
+       EXP_CHECK_DT_OP(exp, getattr);
+       EXP_COUNTER_INCREMENT(exp, getattr);
+       rc = OBP(exp->exp_obd, getattr)(env, exp, oa);
 
-        rc = OBP(exp->exp_obd, getattr_async)(exp, oinfo, set);
-        RETURN(rc);
+       RETURN(rc);
 }
 
 static inline int obd_setattr(const struct lu_env *env, struct obd_export *exp,
-                              struct obd_info *oinfo,
-                              struct obd_trans_info *oti)
-{
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, setattr);
-        EXP_COUNTER_INCREMENT(exp, setattr);
-
-        rc = OBP(exp->exp_obd, setattr)(env, exp, oinfo, oti);
-        RETURN(rc);
-}
-
-/* This performs all the requests set init/wait/destroy actions. */
-static inline int obd_setattr_rqset(struct obd_export *exp,
-                                    struct obd_info *oinfo,
-                                    struct obd_trans_info *oti)
-{
-        struct ptlrpc_request_set *set = NULL;
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, setattr_async);
-        EXP_COUNTER_INCREMENT(exp, setattr_async);
-
-        set =  ptlrpc_prep_set();
-        if (set == NULL)
-                RETURN(-ENOMEM);
-
-        rc = OBP(exp->exp_obd, setattr_async)(exp, oinfo, oti, set);
-        if (rc == 0)
-                rc = ptlrpc_set_wait(set);
-        ptlrpc_set_destroy(set);
-        RETURN(rc);
-}
-
-/* This adds all the requests into @set if @set != NULL, otherwise
-   all requests are sent asynchronously without waiting for response. */
-static inline int obd_setattr_async(struct obd_export *exp,
-                                    struct obd_info *oinfo,
-                                    struct obd_trans_info *oti,
-                                    struct ptlrpc_request_set *set)
+                             struct obdo *oa)
 {
-        int rc;
-        ENTRY;
+       int rc;
 
-        EXP_CHECK_DT_OP(exp, setattr_async);
-        EXP_COUNTER_INCREMENT(exp, setattr_async);
+       ENTRY;
+       EXP_CHECK_DT_OP(exp, setattr);
+       EXP_COUNTER_INCREMENT(exp, setattr);
+       rc = OBP(exp->exp_obd, setattr)(env, exp, oa);
 
-        rc = OBP(exp->exp_obd, setattr_async)(exp, oinfo, oti, set);
-        RETURN(rc);
+       RETURN(rc);
 }
 
 static inline int obd_add_conn(struct obd_import *imp, struct obd_uuid *uuid,
@@ -1157,13 +1010,12 @@ static inline int obd_statfs_async(struct obd_export *exp,
         OBD_CHECK_DT_OP(obd, statfs, -EOPNOTSUPP);
         OBD_COUNTER_INCREMENT(obd, statfs);
 
-        CDEBUG(D_SUPER, "%s: osfs %p age "LPU64", max_age "LPU64"\n",
+       CDEBUG(D_SUPER, "%s: osfs %p age %llu, max_age %llu\n",
                obd->obd_name, &obd->obd_osfs, obd->obd_osfs_age, max_age);
         if (cfs_time_before_64(obd->obd_osfs_age, max_age)) {
                 rc = OBP(obd, statfs_async)(exp, oinfo, max_age, rqset);
         } else {
-                CDEBUG(D_SUPER,"%s: use %p cache blocks "LPU64"/"LPU64
-                       " objects "LPU64"/"LPU64"\n",
+               CDEBUG(D_SUPER, "%s: use %p cache blocks %llu/%llu objects %llu/%llu\n",
                        obd->obd_name, &obd->obd_osfs,
                        obd->obd_osfs.os_bavail, obd->obd_osfs.os_blocks,
                        obd->obd_osfs.os_ffree, obd->obd_osfs.os_files);
@@ -1181,22 +1033,26 @@ static inline int obd_statfs_rqset(struct obd_export *exp,
                                    struct obd_statfs *osfs, __u64 max_age,
                                    __u32 flags)
 {
-        struct ptlrpc_request_set *set = NULL;
-        struct obd_info oinfo = { { { 0 } } };
-        int rc = 0;
-        ENTRY;
+       struct ptlrpc_request_set *set = NULL;
+       struct obd_info oinfo = {
+               .oi_osfs = osfs,
+               .oi_flags = flags,
+       };
+       int rc = 0;
 
-        set =  ptlrpc_prep_set();
-        if (set == NULL)
-                RETURN(-ENOMEM);
+       ENTRY;
 
-        oinfo.oi_osfs = osfs;
-        oinfo.oi_flags = flags;
-        rc = obd_statfs_async(exp, &oinfo, max_age, set);
-        if (rc == 0)
-                rc = ptlrpc_set_wait(set);
-        ptlrpc_set_destroy(set);
-        RETURN(rc);
+       set = ptlrpc_prep_set();
+       if (set == NULL)
+               RETURN(-ENOMEM);
+
+       rc = obd_statfs_async(exp, &oinfo, max_age, set);
+       if (rc == 0)
+               rc = ptlrpc_set_wait(set);
+
+       ptlrpc_set_destroy(set);
+
+       RETURN(rc);
 }
 
 /* @max_age is the oldest time in jiffies that we accept using a cached data.
@@ -1216,7 +1072,7 @@ static inline int obd_statfs(const struct lu_env *env, struct obd_export *exp,
         OBD_CHECK_DT_OP(obd, statfs, -EOPNOTSUPP);
         OBD_COUNTER_INCREMENT(obd, statfs);
 
-        CDEBUG(D_SUPER, "osfs "LPU64", max_age "LPU64"\n",
+       CDEBUG(D_SUPER, "osfs %llu, max_age %llu\n",
                obd->obd_osfs_age, max_age);
         if (cfs_time_before_64(obd->obd_osfs_age, max_age)) {
                 rc = OBP(obd, statfs)(env, exp, osfs, max_age, flags);
@@ -1227,8 +1083,8 @@ static inline int obd_statfs(const struct lu_env *env, struct obd_export *exp,
                        spin_unlock(&obd->obd_osfs_lock);
                }
        } else {
-               CDEBUG(D_SUPER, "%s: use %p cache blocks "LPU64"/"LPU64
-                      " objects "LPU64"/"LPU64"\n",
+               CDEBUG(D_SUPER, "%s: use %p cache blocks %llu/%llu"
+                      " objects %llu/%llu\n",
                       obd->obd_name, &obd->obd_osfs,
                       obd->obd_osfs.os_bavail, obd->obd_osfs.os_blocks,
                       obd->obd_osfs.os_ffree, obd->obd_osfs.os_files);
@@ -1240,43 +1096,40 @@ static inline int obd_statfs(const struct lu_env *env, struct obd_export *exp,
 }
 
 static inline int obd_preprw(const struct lu_env *env, int cmd,
-                             struct obd_export *exp, struct obdo *oa,
-                             int objcount, struct obd_ioobj *obj,
-                             struct niobuf_remote *remote, int *pages,
-                             struct niobuf_local *local,
-                             struct obd_trans_info *oti,
-                             struct lustre_capa *capa)
+                            struct obd_export *exp, struct obdo *oa,
+                            int objcount, struct obd_ioobj *obj,
+                            struct niobuf_remote *remote, int *pages,
+                            struct niobuf_local *local)
 {
-        int rc;
-        ENTRY;
+       int rc;
 
-        EXP_CHECK_DT_OP(exp, preprw);
-        EXP_COUNTER_INCREMENT(exp, preprw);
+       ENTRY;
+       EXP_CHECK_DT_OP(exp, preprw);
+       EXP_COUNTER_INCREMENT(exp, preprw);
+       rc = OBP(exp->exp_obd, preprw)(env, cmd, exp, oa, objcount, obj, remote,
+                                      pages, local);
 
-        rc = OBP(exp->exp_obd, preprw)(env, cmd, exp, oa, objcount, obj, remote,
-                                       pages, local, oti, capa);
-        RETURN(rc);
+       RETURN(rc);
 }
 
 static inline int obd_commitrw(const struct lu_env *env, int cmd,
-                               struct obd_export *exp, struct obdo *oa,
-                               int objcount, struct obd_ioobj *obj,
-                               struct niobuf_remote *rnb, int pages,
-                               struct niobuf_local *local,
-                               struct obd_trans_info *oti, int rc)
+                              struct obd_export *exp, struct obdo *oa,
+                              int objcount, struct obd_ioobj *obj,
+                              struct niobuf_remote *rnb, int pages,
+                              struct niobuf_local *local, int rc)
 {
-        ENTRY;
+       ENTRY;
 
-        EXP_CHECK_DT_OP(exp, commitrw);
-        EXP_COUNTER_INCREMENT(exp, commitrw);
+       EXP_CHECK_DT_OP(exp, commitrw);
+       EXP_COUNTER_INCREMENT(exp, commitrw);
+       rc = OBP(exp->exp_obd, commitrw)(env, cmd, exp, oa, objcount, obj,
+                                        rnb, pages, local, rc);
 
-        rc = OBP(exp->exp_obd, commitrw)(env, cmd, exp, oa, objcount, obj,
-                                         rnb, pages, local, oti, rc);
-        RETURN(rc);
+       RETURN(rc);
 }
 
 static inline int obd_iocontrol(unsigned int cmd, struct obd_export *exp,
-                                int len, void *karg, void *uarg)
+                               int len, void *karg, void __user *uarg)
 {
         int rc;
         ENTRY;
@@ -1288,34 +1141,6 @@ static inline int obd_iocontrol(unsigned int cmd, struct obd_export *exp,
         RETURN(rc);
 }
 
-static inline int obd_change_cbdata(struct obd_export *exp,
-                                    struct lov_stripe_md *lsm,
-                                    ldlm_iterator_t it, void *data)
-{
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, change_cbdata);
-        EXP_COUNTER_INCREMENT(exp, change_cbdata);
-
-        rc = OBP(exp->exp_obd, change_cbdata)(exp, lsm, it, data);
-        RETURN(rc);
-}
-
-static inline int obd_find_cbdata(struct obd_export *exp,
-                                  struct lov_stripe_md *lsm,
-                                  ldlm_iterator_t it, void *data)
-{
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, find_cbdata);
-        EXP_COUNTER_INCREMENT(exp, find_cbdata);
-
-        rc = OBP(exp->exp_obd, find_cbdata)(exp, lsm, it, data);
-        RETURN(rc);
-}
-
 static inline void obd_import_event(struct obd_device *obd,
                                     struct obd_import *imp,
                                     enum obd_import_event event)
@@ -1334,67 +1159,48 @@ static inline void obd_import_event(struct obd_device *obd,
 }
 
 static inline int obd_notify(struct obd_device *obd,
-                             struct obd_device *watched,
-                             enum obd_notify_event ev,
-                             void *data)
+                            struct obd_device *watched,
+                            enum obd_notify_event ev)
 {
-        int rc;
-        ENTRY;
-        OBD_CHECK_DEV(obd);
+       int rc;
+       ENTRY;
+       OBD_CHECK_DEV(obd);
 
        if (!obd->obd_set_up) {
-                CDEBUG(D_HA, "obd %s not set up\n", obd->obd_name);
-                RETURN(-EINVAL);
-        }
+               CDEBUG(D_HA, "obd %s not set up\n", obd->obd_name);
+               RETURN(-EINVAL);
+       }
 
-        if (!OBP(obd, notify)) {
-                CDEBUG(D_HA, "obd %s has no notify handler\n", obd->obd_name);
-                RETURN(-ENOSYS);
-        }
+       if (!OBP(obd, notify)) {
+               CDEBUG(D_HA, "obd %s has no notify handler\n", obd->obd_name);
+               RETURN(-ENOSYS);
+       }
 
-        OBD_COUNTER_INCREMENT(obd, notify);
-        rc = OBP(obd, notify)(obd, watched, ev, data);
-        RETURN(rc);
+       OBD_COUNTER_INCREMENT(obd, notify);
+       rc = OBP(obd, notify)(obd, watched, ev);
+
+       RETURN(rc);
 }
 
 static inline int obd_notify_observer(struct obd_device *observer,
-                                      struct obd_device *observed,
-                                      enum obd_notify_event ev,
-                                      void *data)
+                                     struct obd_device *observed,
+                                     enum obd_notify_event ev)
 {
-        int rc1;
-        int rc2;
-
-        struct obd_notify_upcall *onu;
-
-        if (observer->obd_observer)
-                rc1 = obd_notify(observer->obd_observer, observed, ev, data);
-        else
-                rc1 = 0;
-        /*
-         * Also, call non-obd listener, if any
-         */
-        onu = &observer->obd_upcall;
-        if (onu->onu_upcall != NULL)
-                rc2 = onu->onu_upcall(observer, observed, ev,
-                                      onu->onu_owner, NULL);
-        else
-                rc2 = 0;
-
-        return rc1 ? rc1 : rc2;
-}
+       int rc = 0;
+       int rc2 = 0;
+       struct obd_notify_upcall *onu;
 
-static inline int obd_quotacheck(struct obd_export *exp,
-                                 struct obd_quotactl *oqctl)
-{
-        int rc;
-        ENTRY;
+       if (observer->obd_observer)
+               rc = obd_notify(observer->obd_observer, observed, ev);
 
-        EXP_CHECK_DT_OP(exp, quotacheck);
-        EXP_COUNTER_INCREMENT(exp, quotacheck);
+       /*
+        * Also, call non-obd listener, if any
+        */
+       onu = &observer->obd_upcall;
+       if (onu->onu_upcall != NULL)
+               rc2 = onu->onu_upcall(observer, observed, ev, onu->onu_owner);
 
-        rc = OBP(exp->exp_obd, quotacheck)(exp->exp_obd, exp, oqctl);
-        RETURN(rc);
+       return rc ? rc : rc2;
 }
 
 static inline int obd_quotactl(struct obd_export *exp,
@@ -1453,16 +1259,17 @@ static inline int obd_register_observer(struct obd_device *obd,
 }
 
 /* metadata helpers */
-static inline int md_getstatus(struct obd_export *exp,
-                               struct lu_fid *fid, struct obd_capa **pc)
+static inline int md_get_root(struct obd_export *exp, const char *fileset,
+                             struct lu_fid *fid)
 {
-        int rc;
-        ENTRY;
+       int rc;
 
-        EXP_CHECK_MD_OP(exp, getstatus);
-        EXP_MD_COUNTER_INCREMENT(exp, getstatus);
-        rc = MDP(exp->exp_obd, getstatus)(exp, fid, pc);
-        RETURN(rc);
+       ENTRY;
+       EXP_CHECK_MD_OP(exp, get_root);
+       EXP_MD_COUNTER_INCREMENT(exp, get_root);
+       rc = MDP(exp->exp_obd, get_root)(exp, fileset, fid);
+
+       RETURN(rc);
 }
 
 static inline int md_getattr(struct obd_export *exp, struct md_op_data *op_data,
@@ -1487,18 +1294,6 @@ static inline int md_null_inode(struct obd_export *exp,
         RETURN(rc);
 }
 
-static inline int md_find_cbdata(struct obd_export *exp,
-                                 const struct lu_fid *fid,
-                                 ldlm_iterator_t it, void *data)
-{
-        int rc;
-        ENTRY;
-        EXP_CHECK_MD_OP(exp, find_cbdata);
-        EXP_MD_COUNTER_INCREMENT(exp, find_cbdata);
-        rc = MDP(exp->exp_obd, find_cbdata)(exp, fid, it, data);
-        RETURN(rc);
-}
-
 static inline int md_close(struct obd_export *exp, struct md_op_data *op_data,
                            struct md_open_data *mod,
                            struct ptlrpc_request **request)
@@ -1512,9 +1307,9 @@ static inline int md_close(struct obd_export *exp, struct md_op_data *op_data,
 }
 
 static inline int md_create(struct obd_export *exp, struct md_op_data *op_data,
-                            const void *data, int datalen, int mode, __u32 uid,
-                            __u32 gid, cfs_cap_t cap_effective, __u64 rdev,
-                            struct ptlrpc_request **request)
+                           const void *data, size_t datalen, umode_t mode,
+                           uid_t uid, gid_t gid, cfs_cap_t cap_effective,
+                           __u64 rdev, struct ptlrpc_request **request)
 {
         int rc;
         ENTRY;
@@ -1525,22 +1320,9 @@ static inline int md_create(struct obd_export *exp, struct md_op_data *op_data,
         RETURN(rc);
 }
 
-static inline int md_done_writing(struct obd_export *exp,
-                                  struct md_op_data *op_data,
-                                  struct md_open_data *mod)
-{
-        int rc;
-        ENTRY;
-        EXP_CHECK_MD_OP(exp, done_writing);
-        EXP_MD_COUNTER_INCREMENT(exp, done_writing);
-        rc = MDP(exp->exp_obd, done_writing)(exp, op_data, mod);
-        RETURN(rc);
-}
-
 static inline int md_enqueue(struct obd_export *exp,
                             struct ldlm_enqueue_info *einfo,
                             const union ldlm_policy_data *policy,
-                            struct lookup_intent *it,
                             struct md_op_data *op_data,
                             struct lustre_handle *lockh,
                             __u64 extra_lock_flags)
@@ -1549,7 +1331,7 @@ static inline int md_enqueue(struct obd_export *exp,
        ENTRY;
        EXP_CHECK_MD_OP(exp, enqueue);
        EXP_MD_COUNTER_INCREMENT(exp, enqueue);
-       rc = MDP(exp->exp_obd, enqueue)(exp, einfo, policy, it, op_data, lockh,
+       rc = MDP(exp->exp_obd, enqueue)(exp, einfo, policy, op_data, lockh,
                                        extra_lock_flags);
         RETURN(rc);
 }
@@ -1594,8 +1376,8 @@ static inline int md_link(struct obd_export *exp, struct md_op_data *op_data,
 }
 
 static inline int md_rename(struct obd_export *exp, struct md_op_data *op_data,
-                            const char *old, int oldlen, const char *new,
-                            int newlen, struct ptlrpc_request **request)
+                           const char *old, size_t oldlen, const char *new,
+                           size_t newlen, struct ptlrpc_request **request)
 {
         int rc;
         ENTRY;
@@ -1607,27 +1389,27 @@ static inline int md_rename(struct obd_export *exp, struct md_op_data *op_data,
 }
 
 static inline int md_setattr(struct obd_export *exp, struct md_op_data *op_data,
-                             void *ea, int ealen, void *ea2, int ea2len,
-                             struct ptlrpc_request **request,
-                             struct md_open_data **mod)
+                            void *ea, size_t ealen,
+                            struct ptlrpc_request **request)
 {
-        int rc;
-        ENTRY;
-        EXP_CHECK_MD_OP(exp, setattr);
-        EXP_MD_COUNTER_INCREMENT(exp, setattr);
-        rc = MDP(exp->exp_obd, setattr)(exp, op_data, ea, ealen,
-                                        ea2, ea2len, request, mod);
-        RETURN(rc);
+       int rc;
+       ENTRY;
+       EXP_CHECK_MD_OP(exp, setattr);
+       EXP_MD_COUNTER_INCREMENT(exp, setattr);
+       rc = MDP(exp->exp_obd, setattr)(exp, op_data, ea, ealen, request);
+       RETURN(rc);
 }
 
 static inline int md_fsync(struct obd_export *exp, const struct lu_fid *fid,
-                          struct obd_capa *oc, struct ptlrpc_request **request)
+                          struct ptlrpc_request **request)
 {
        int rc;
+
        ENTRY;
        EXP_CHECK_MD_OP(exp, fsync);
        EXP_MD_COUNTER_INCREMENT(exp, fsync);
-       rc = MDP(exp->exp_obd, fsync)(exp, fid, oc, request);
+       rc = MDP(exp->exp_obd, fsync)(exp, fid, request);
+
        RETURN(rc);
 }
 
@@ -1678,55 +1460,43 @@ static inline int md_free_lustre_md(struct obd_export *exp,
         RETURN(MDP(exp->exp_obd, free_lustre_md)(exp, md));
 }
 
-static inline int md_update_lsm_md(struct obd_export *exp,
-                                  struct lmv_stripe_md *lsm,
-                                  struct mdt_body *body,
-                                  ldlm_blocking_callback cb)
-{
-       ENTRY;
-       EXP_CHECK_MD_OP(exp, update_lsm_md);
-       EXP_MD_COUNTER_INCREMENT(exp, update_lsm_md);
-       RETURN(MDP(exp->exp_obd, update_lsm_md)(exp, lsm, body, cb));
-}
-
 static inline int md_merge_attr(struct obd_export *exp,
                                const struct lmv_stripe_md *lsm,
-                               struct cl_attr *attr)
+                               struct cl_attr *attr,
+                               ldlm_blocking_callback cb)
 {
        ENTRY;
        EXP_CHECK_MD_OP(exp, merge_attr);
        EXP_MD_COUNTER_INCREMENT(exp, merge_attr);
-       RETURN(MDP(exp->exp_obd, merge_attr)(exp, lsm, attr));
+       RETURN(MDP(exp->exp_obd, merge_attr)(exp, lsm, attr, cb));
 }
 
-static inline int md_setxattr(struct obd_export *exp,
-                              const struct lu_fid *fid, struct obd_capa *oc,
-                              obd_valid valid, const char *name,
-                              const char *input, int input_size,
-                              int output_size, int flags, __u32 suppgid,
-                              struct ptlrpc_request **request)
+static inline int md_setxattr(struct obd_export *exp, const struct lu_fid *fid,
+                             u64 valid, const char *name,
+                             const char *input, int input_size,
+                             int output_size, int flags, __u32 suppgid,
+                             struct ptlrpc_request **request)
 {
-        ENTRY;
-        EXP_CHECK_MD_OP(exp, setxattr);
-        EXP_MD_COUNTER_INCREMENT(exp, setxattr);
-        RETURN(MDP(exp->exp_obd, setxattr)(exp, fid, oc, valid, name, input,
-                                           input_size, output_size, flags,
-                                           suppgid, request));
+       ENTRY;
+       EXP_CHECK_MD_OP(exp, setxattr);
+       EXP_MD_COUNTER_INCREMENT(exp, setxattr);
+       RETURN(MDP(exp->exp_obd, setxattr)(exp, fid, valid, name, input,
+                                          input_size, output_size, flags,
+                                          suppgid, request));
 }
 
-static inline int md_getxattr(struct obd_export *exp,
-                              const struct lu_fid *fid, struct obd_capa *oc,
-                              obd_valid valid, const char *name,
-                              const char *input, int input_size,
-                              int output_size, int flags,
-                              struct ptlrpc_request **request)
+static inline int md_getxattr(struct obd_export *exp, const struct lu_fid *fid,
+                             u64 valid, const char *name,
+                             const char *input, int input_size,
+                             int output_size, int flags,
+                             struct ptlrpc_request **request)
 {
-        ENTRY;
-        EXP_CHECK_MD_OP(exp, getxattr);
-        EXP_MD_COUNTER_INCREMENT(exp, getxattr);
-        RETURN(MDP(exp->exp_obd, getxattr)(exp, fid, oc, valid, name, input,
-                                           input_size, output_size, flags,
-                                           request));
+       ENTRY;
+       EXP_CHECK_MD_OP(exp, getxattr);
+       EXP_MD_COUNTER_INCREMENT(exp, getxattr);
+       RETURN(MDP(exp->exp_obd, getxattr)(exp, fid, valid, name, input,
+                                          input_size, output_size, flags,
+                                          request));
 }
 
 static inline int md_set_open_replay_data(struct obd_export *exp,
@@ -1749,7 +1519,8 @@ static inline int md_clear_open_replay_data(struct obd_export *exp,
 }
 
 static inline int md_set_lock_data(struct obd_export *exp,
-                                   __u64 *lockh, void *data, __u64 *bits)
+                                  const struct lustre_handle *lockh,
+                                  void *data, __u64 *bits)
 {
         ENTRY;
         EXP_CHECK_MD_OP(exp, set_lock_data);
@@ -1757,95 +1528,54 @@ static inline int md_set_lock_data(struct obd_export *exp,
         RETURN(MDP(exp->exp_obd, set_lock_data)(exp, lockh, data, bits));
 }
 
-static inline int md_cancel_unused(struct obd_export *exp,
-                                   const struct lu_fid *fid,
-                                   ldlm_policy_data_t *policy,
-                                   ldlm_mode_t mode,
-                                   ldlm_cancel_flags_t flags,
-                                   void *opaque)
+static inline
+int md_cancel_unused(struct obd_export *exp, const struct lu_fid *fid,
+                    union ldlm_policy_data *policy, enum ldlm_mode mode,
+                    enum ldlm_cancel_flags cancel_flags, void *opaque)
 {
-        int rc;
-        ENTRY;
+       int rc;
+       ENTRY;
 
-        EXP_CHECK_MD_OP(exp, cancel_unused);
-        EXP_MD_COUNTER_INCREMENT(exp, cancel_unused);
+       EXP_CHECK_MD_OP(exp, cancel_unused);
+       EXP_MD_COUNTER_INCREMENT(exp, cancel_unused);
 
-        rc = MDP(exp->exp_obd, cancel_unused)(exp, fid, policy, mode,
-                                              flags, opaque);
-        RETURN(rc);
+       rc = MDP(exp->exp_obd, cancel_unused)(exp, fid, policy, mode,
+                                             cancel_flags, opaque);
+       RETURN(rc);
 }
 
-static inline ldlm_mode_t md_lock_match(struct obd_export *exp, __u64 flags,
-                                        const struct lu_fid *fid,
-                                        ldlm_type_t type,
-                                        ldlm_policy_data_t *policy,
-                                        ldlm_mode_t mode,
-                                        struct lustre_handle *lockh)
+static inline enum ldlm_mode md_lock_match(struct obd_export *exp, __u64 flags,
+                                          const struct lu_fid *fid,
+                                          enum ldlm_type type,
+                                          union ldlm_policy_data *policy,
+                                          enum ldlm_mode mode,
+                                          struct lustre_handle *lockh)
 {
-        ENTRY;
-        EXP_CHECK_MD_OP(exp, lock_match);
-        EXP_MD_COUNTER_INCREMENT(exp, lock_match);
-        RETURN(MDP(exp->exp_obd, lock_match)(exp, flags, fid, type,
-                                             policy, mode, lockh));
+       ENTRY;
+       EXP_CHECK_MD_OP(exp, lock_match);
+       EXP_MD_COUNTER_INCREMENT(exp, lock_match);
+       RETURN(MDP(exp->exp_obd, lock_match)(exp, flags, fid, type,
+                                            policy, mode, lockh));
 }
 
-static inline int md_init_ea_size(struct obd_export *exp, int easize,
-                                 int def_asize, int cookiesize,
-                                 int def_cookiesize)
+static inline int md_init_ea_size(struct obd_export *exp, __u32 ea_size,
+                                 __u32 def_ea_size)
 {
        ENTRY;
        EXP_CHECK_MD_OP(exp, init_ea_size);
        EXP_MD_COUNTER_INCREMENT(exp, init_ea_size);
-       RETURN(MDP(exp->exp_obd, init_ea_size)(exp, easize, def_asize,
-                                              cookiesize, def_cookiesize));
-}
-
-static inline int md_get_remote_perm(struct obd_export *exp,
-                                     const struct lu_fid *fid,
-                                     struct obd_capa *oc, __u32 suppgid,
-                                     struct ptlrpc_request **request)
-{
-        ENTRY;
-        EXP_CHECK_MD_OP(exp, get_remote_perm);
-        EXP_MD_COUNTER_INCREMENT(exp, get_remote_perm);
-        RETURN(MDP(exp->exp_obd, get_remote_perm)(exp, fid, oc, suppgid,
-                                                  request));
-}
-
-static inline int md_renew_capa(struct obd_export *exp, struct obd_capa *ocapa,
-                                renew_capa_cb_t cb)
-{
-        int rc;
-        ENTRY;
-        EXP_CHECK_MD_OP(exp, renew_capa);
-        EXP_MD_COUNTER_INCREMENT(exp, renew_capa);
-        rc = MDP(exp->exp_obd, renew_capa)(exp, ocapa, cb);
-        RETURN(rc);
-}
-
-static inline int md_unpack_capa(struct obd_export *exp,
-                                 struct ptlrpc_request *req,
-                                 const struct req_msg_field *field,
-                                 struct obd_capa **oc)
-{
-        int rc;
-        ENTRY;
-        EXP_CHECK_MD_OP(exp, unpack_capa);
-        EXP_MD_COUNTER_INCREMENT(exp, unpack_capa);
-        rc = MDP(exp->exp_obd, unpack_capa)(exp, req, field, oc);
-        RETURN(rc);
+       RETURN(MDP(exp->exp_obd, init_ea_size)(exp, ea_size, def_ea_size));
 }
 
 static inline int md_intent_getattr_async(struct obd_export *exp,
-                                          struct md_enqueue_info *minfo,
-                                          struct ldlm_enqueue_info *einfo)
+                                         struct md_enqueue_info *minfo)
 {
-        int rc;
-        ENTRY;
-        EXP_CHECK_MD_OP(exp, intent_getattr_async);
-        EXP_MD_COUNTER_INCREMENT(exp, intent_getattr_async);
-        rc = MDP(exp->exp_obd, intent_getattr_async)(exp, minfo, einfo);
-        RETURN(rc);
+       int rc;
+       ENTRY;
+       EXP_CHECK_MD_OP(exp, intent_getattr_async);
+       EXP_MD_COUNTER_INCREMENT(exp, intent_getattr_async);
+       rc = MDP(exp->exp_obd, intent_getattr_async)(exp, minfo);
+       RETURN(rc);
 }
 
 static inline int md_revalidate_lock(struct obd_export *exp,
@@ -1873,6 +1603,25 @@ static inline int md_get_fid_from_lsm(struct obd_export *exp,
        RETURN(rc);
 }
 
+
+/* Unpack an MD struct from disk to in-memory format.
+ * Returns +ve size of unpacked MD (0 for free), or -ve error.
+ *
+ * If *plsm != NULL and lmm == NULL then *lsm will be freed.
+ * If *plsm == NULL then it will be allocated.
+ */
+static inline int md_unpackmd(struct obd_export *exp,
+                             struct lmv_stripe_md **plsm,
+                             const union lmv_mds_md *lmm, size_t lmm_size)
+{
+       int rc;
+       ENTRY;
+       EXP_CHECK_MD_OP(exp, unpackmd);
+       EXP_MD_COUNTER_INCREMENT(exp, unpackmd);
+       rc = MDP(exp->exp_obd, unpackmd)(exp, plsm, lmm, lmm_size);
+       RETURN(rc);
+}
+
 /* OBD Metadata Support */
 
 extern int obd_init_caches(void);
@@ -1898,7 +1647,8 @@ struct lwp_register_item {
        struct obd_export **lri_exp;
        register_lwp_cb     lri_cb_func;
        void               *lri_cb_data;
-       cfs_list_t          lri_list;
+       struct list_head    lri_list;
+       atomic_t            lri_ref;
        char                lri_name[MTI_NAME_MAXLEN];
 };
 
@@ -1914,12 +1664,16 @@ int lustre_register_lwp_item(const char *lwpname, struct obd_export **exp,
                             register_lwp_cb cb_func, void *cb_data);
 void lustre_deregister_lwp_item(struct obd_export **exp);
 struct obd_export *lustre_find_lwp_by_index(const char *dev, __u32 idx);
+void lustre_notify_lwp_list(struct obd_export *exp);
 int tgt_name2lwp_name(const char *tgt_name, char *lwp_name, int len, __u32 idx);
 #endif /* HAVE_SERVER_SUPPORT */
+int lustre_register_fs(void);
+int lustre_unregister_fs(void);
+int lustre_check_exclusion(struct super_block *sb, char *svname);
 
 /* sysctl.c */
-extern void obd_sysctl_init (void);
-extern void obd_sysctl_clean (void);
+extern int obd_sysctl_init(void);
+extern void obd_sysctl_clean(void);
 
 /* uuid.c  */
 typedef __u8 class_uuid_t[16];
@@ -1930,12 +1684,18 @@ int lustre_uuid_to_peer(const char *uuid, lnet_nid_t *peer_nid, int index);
 int class_add_uuid(const char *uuid, __u64 nid);
 int class_del_uuid (const char *uuid);
 int class_check_uuid(struct obd_uuid *uuid, __u64 nid);
-void class_init_uuidlist(void);
-void class_exit_uuidlist(void);
+
+/* class_obd.c */
+extern char obd_jobid_node[];
 
 /* prng.c */
 #define ll_generate_random_uuid(uuid_out) cfs_get_random_bytes(uuid_out, sizeof(class_uuid_t))
 
+/* statfs_pack.c */
+struct kstatfs;
+void statfs_pack(struct obd_statfs *osfs, struct kstatfs *sfs);
+void statfs_unpack(struct kstatfs *sfs, struct obd_statfs *osfs);
+
 /* root squash info */
 struct rw_semaphore;
 struct root_squash_info {
@@ -1945,10 +1705,12 @@ struct root_squash_info {
        struct rw_semaphore     rsi_sem;
 };
 
-#ifdef __KERNEL__
 int server_name2index(const char *svname, __u32 *idx, const char **endptr);
-#else
-# define server_name2index(name, idx, ptr)     do {} while (0)
-#endif
+
+/* linux-module.c */
+extern struct miscdevice obd_psdev;
+int obd_ioctl_getdata(char **buf, int *len, void __user *arg);
+int class_procfs_init(void);
+int class_procfs_clean(void);
 
 #endif /* __LINUX_OBD_CLASS_H */