Whamcloud - gitweb
LU-7888 obdclass: not hold global lock when lwp callback
[fs/lustre-release.git] / lustre / include / obd_class.h
index 905825f..0b72e84 100644 (file)
@@ -27,7 +27,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, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -36,9 +36,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
                                          * by the request interpret routine */
 #define OBD_STATFS_FOR_MDT0    0x0008  /* The statfs is only for retrieving
                                         * information from MDT0. */
-#define OBD_FL_PUNCH    0x00000001      /* To indicate it is punch operation */
 
 /* OBD Device Declarations */
 extern struct obd_device *obd_devs[MAX_OBD_DEVICES];
+extern struct list_head obd_types;
+extern spinlock_t obd_types_lock;
 extern rwlock_t obd_dev_lock;
 
 /* OBD Operations Declarations */
@@ -86,9 +74,9 @@ struct lu_device_type;
 
 /* genops.c */
 struct obd_export *class_conn2export(struct lustre_handle *);
-int class_register_type(struct obd_ops *, struct md_ops *,
-                        struct lprocfs_vars *, const char *nm,
-                        struct lu_device_type *ldt);
+int class_register_type(struct obd_ops *, struct md_ops *, bool enable_proc,
+                       struct lprocfs_vars *module_vars,
+                       const char *nm, struct lu_device_type *ldt);
 int class_unregister_type(const char *nm);
 
 struct obd_device *class_newdev(const char *type_name, const char *name);
@@ -122,20 +110,40 @@ 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 *);
+
+extern atomic_t         obd_stale_export_num;
+extern struct list_head obd_stale_exports;
+extern spinlock_t       obd_stale_export_lock;
+
+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);
 int class_process_proc_param(char *prefix, struct lprocfs_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);
@@ -151,16 +159,6 @@ int class_config_llog_handler(const struct lu_env *env,
 int class_add_conn(struct obd_device *obd, struct lustre_cfg *lcfg);
 int class_add_uuid(const char *uuid, __u64 nid);
 
-/*obdecho*/
-#ifdef LPROCFS
-extern void lprocfs_echo_init_vars(struct lprocfs_static_vars *lvars);
-#else
-static inline void lprocfs_echo_init_vars(struct lprocfs_static_vars *lvars)
-{
-        memset(lvars, 0, sizeof(*lvars));
-}
-#endif
-
 #define CFG_F_START     0x01   /* Set when we start updating from a log */
 #define CFG_F_MARKER    0x02   /* We are within a maker */
 #define CFG_F_SKIP      0x04   /* We should ignore this cfg command */
@@ -169,18 +167,17 @@ static inline void lprocfs_echo_init_vars(struct lprocfs_static_vars *lvars)
 
 /* Passed as data param to class_config_parse_llog */
 struct config_llog_instance {
-        char               *cfg_obdname;
-        void               *cfg_instance;
-        struct super_block *cfg_sb;
-        struct obd_uuid     cfg_uuid;
-       llog_cb_t           cfg_callback;
-        int                 cfg_last_idx; /* for partial llog processing */
-        int                 cfg_flags;
+       char                    *cfg_obdname;
+       void                    *cfg_instance;
+       struct super_block      *cfg_sb;
+       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;
 };
 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,
@@ -197,8 +194,8 @@ enum {
 struct config_llog_data {
         struct ldlm_res_id          cld_resid;
         struct config_llog_instance cld_cfg;
-        cfs_list_t                  cld_list_chain;
-        cfs_atomic_t                cld_refcount;
+       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_recover;/* imperative recover log */
@@ -212,16 +209,20 @@ struct config_llog_data {
 };
 
 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 *);
@@ -237,53 +238,53 @@ extern void (*class_export_dump_hook)(struct obd_export *);
 
 #define class_export_rpc_inc(exp)                                       \
 ({                                                                      \
-        cfs_atomic_inc(&(exp)->exp_rpc_count);                          \
-        CDEBUG(D_INFO, "RPC GETting export %p : new rpc_count %d\n",    \
-               (exp), cfs_atomic_read(&(exp)->exp_rpc_count));          \
+       atomic_inc(&(exp)->exp_rpc_count);                              \
+       CDEBUG(D_INFO, "RPC GETting export %p : new rpc_count %d\n",    \
+              (exp), atomic_read(&(exp)->exp_rpc_count));              \
 })
 
 #define class_export_rpc_dec(exp)                                       \
 ({                                                                      \
-        LASSERT_ATOMIC_POS(&exp->exp_rpc_count);                        \
-        cfs_atomic_dec(&(exp)->exp_rpc_count);                          \
-        CDEBUG(D_INFO, "RPC PUTting export %p : new rpc_count %d\n",    \
-               (exp), cfs_atomic_read(&(exp)->exp_rpc_count));          \
+       LASSERT_ATOMIC_POS(&exp->exp_rpc_count);                        \
+       atomic_dec(&(exp)->exp_rpc_count);                              \
+       CDEBUG(D_INFO, "RPC PUTting export %p : new rpc_count %d\n",    \
+              (exp), atomic_read(&(exp)->exp_rpc_count));              \
 })
 
 #define class_export_lock_get(exp, lock)                                \
 ({                                                                      \
-        cfs_atomic_inc(&(exp)->exp_locks_count);                        \
-        __class_export_add_lock_ref(exp, lock);                         \
-        CDEBUG(D_INFO, "lock GETting export %p : new locks_count %d\n", \
-               (exp), cfs_atomic_read(&(exp)->exp_locks_count));        \
-        class_export_get(exp);                                          \
+       atomic_inc(&(exp)->exp_locks_count);                            \
+       __class_export_add_lock_ref(exp, lock);                         \
+       CDEBUG(D_INFO, "lock GETting export %p : new locks_count %d\n", \
+              (exp), atomic_read(&(exp)->exp_locks_count));            \
+       class_export_get(exp);                                          \
 })
 
 #define class_export_lock_put(exp, lock)                                \
 ({                                                                      \
-        LASSERT_ATOMIC_POS(&exp->exp_locks_count);                      \
-        cfs_atomic_dec(&(exp)->exp_locks_count);                        \
-        __class_export_del_lock_ref(exp, lock);                         \
-        CDEBUG(D_INFO, "lock PUTting export %p : new locks_count %d\n", \
-               (exp), cfs_atomic_read(&(exp)->exp_locks_count));        \
-        class_export_put(exp);                                          \
+       LASSERT_ATOMIC_POS(&exp->exp_locks_count);                      \
+       atomic_dec(&(exp)->exp_locks_count);                            \
+       __class_export_del_lock_ref(exp, lock);                         \
+       CDEBUG(D_INFO, "lock PUTting export %p : new locks_count %d\n", \
+              (exp), atomic_read(&(exp)->exp_locks_count));            \
+       class_export_put(exp);                                          \
 })
 
 #define class_export_cb_get(exp)                                        \
 ({                                                                      \
-        cfs_atomic_inc(&(exp)->exp_cb_count);                           \
-        CDEBUG(D_INFO, "callback GETting export %p : new cb_count %d\n",\
-               (exp), cfs_atomic_read(&(exp)->exp_cb_count));           \
-        class_export_get(exp);                                          \
+       atomic_inc(&(exp)->exp_cb_count);                               \
+       CDEBUG(D_INFO, "callback GETting export %p : new cb_count %d\n",\
+              (exp), atomic_read(&(exp)->exp_cb_count));               \
+       class_export_get(exp);                                          \
 })
 
 #define class_export_cb_put(exp)                                        \
 ({                                                                      \
-        LASSERT_ATOMIC_POS(&exp->exp_cb_count);                         \
-        cfs_atomic_dec(&(exp)->exp_cb_count);                           \
-        CDEBUG(D_INFO, "callback PUTting export %p : new cb_count %d\n",\
-               (exp), cfs_atomic_read(&(exp)->exp_cb_count));           \
-        class_export_put(exp);                                          \
+       LASSERT_ATOMIC_POS(&exp->exp_cb_count);                         \
+       atomic_dec(&(exp)->exp_cb_count);                               \
+       CDEBUG(D_INFO, "callback PUTting export %p : new cb_count %d\n",\
+              (exp), atomic_read(&(exp)->exp_cb_count));               \
+       class_export_put(exp);                                          \
 })
 
 /* genops.c */
@@ -322,6 +323,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;
 }
 
@@ -332,17 +335,15 @@ static inline struct lr_server_data *class_server_data(struct obd_device *obd)
 }
 #endif
 
-void obdo_cpy_md(struct obdo *dst, struct obdo *src, obd_flag valid);
-void obdo_to_ioobj(struct obdo *oa, struct obd_ioobj *ioobj);
-void obdo_from_iattr(struct obdo *oa, struct iattr *attr,
-                     unsigned int ia_valid);
-void iattr_from_obdo(struct iattr *attr, struct obdo *oa, obd_flag valid);
-void md_from_obdo(struct md_op_data *op_data, struct obdo *oa, obd_flag valid);
-void obdo_from_md(struct obdo *oa, struct md_op_data *op_data,
-                  unsigned int 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_cpu_to_le(struct obdo *dobdo, struct obdo *sobdo);
-void obdo_le_to_cpu(struct obdo *dobdo, struct obdo *sobdo);
+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);
 
 #define OBT(dev)        (dev)->obd_type
 #define OBP(dev, op)    (dev)->obd_type->typ_dt_ops->o_ ## op
@@ -371,7 +372,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))                               \
@@ -501,26 +502,25 @@ static inline int class_devno_max(void)
         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;
@@ -565,7 +565,7 @@ static inline int obd_setup(struct obd_device *obd, struct lustre_cfg *cfg)
         if (ldt != NULL) {
                 struct lu_context  session_ctx;
                 struct lu_env env;
-                lu_context_init(&session_ctx, LCT_SESSION);
+                lu_context_init(&session_ctx, LCT_SESSION | LCT_SERVER_SESSION);
                 session_ctx.lc_thread = NULL;
                 lu_context_enter(&session_ctx);
 
@@ -592,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)
@@ -660,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;
         }
@@ -702,238 +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);
-}
-
-/* helper functions */
-static inline int obd_alloc_diskmd(struct obd_export *exp,
-                                   struct lov_mds_md **disk_tgt)
-{
-        LASSERT(disk_tgt);
-        LASSERT(*disk_tgt == NULL);
-        return obd_packmd(exp, disk_tgt, NULL);
-}
-
-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_precreate(struct obd_export *exp)
-{
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, precreate);
-        OBD_COUNTER_INCREMENT(exp->exp_obd, precreate);
-
-        rc = OBP(exp->exp_obd, precreate)(exp);
-        RETURN(rc);
-}
-
-static inline int obd_create_async(struct obd_export *exp,
-                                   struct obd_info *oinfo,
-                                   struct lov_stripe_md **ea,
-                                   struct obd_trans_info *oti)
-{
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, create_async);
-        EXP_COUNTER_INCREMENT(exp, create_async);
-
-        rc = OBP(exp->exp_obd, create_async)(exp, oinfo, ea, oti);
-        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)
+                             struct obdo *oa)
 {
-        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)
-{
-        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,
@@ -1065,18 +876,19 @@ static inline int obd_fid_fini(struct obd_device *obd)
        RETURN(rc);
 }
 
-static inline int obd_fid_alloc(struct obd_export *exp,
+static inline int obd_fid_alloc(const struct lu_env *env,
+                               struct obd_export *exp,
                                 struct lu_fid *fid,
                                 struct md_op_data *op_data)
 {
-        int rc;
-        ENTRY;
+       int rc;
+       ENTRY;
 
-        EXP_CHECK_DT_OP(exp, fid_alloc);
-        EXP_COUNTER_INCREMENT(exp, fid_alloc);
+       EXP_CHECK_DT_OP(exp, fid_alloc);
+       EXP_COUNTER_INCREMENT(exp, fid_alloc);
 
-        rc = OBP(exp->exp_obd, fid_alloc)(exp, fid, op_data);
-        RETURN(rc);
+       rc = OBP(exp->exp_obd, fid_alloc)(env, exp, fid, op_data);
+       RETURN(rc);
 }
 
 static inline int obd_ping(const struct lu_env *env, struct obd_export *exp)
@@ -1179,27 +991,6 @@ static inline int obd_destroy_export(struct obd_export *exp)
         RETURN(0);
 }
 
-static inline int obd_extent_calc(struct obd_export *exp,
-                                  struct lov_stripe_md *md,
-                                  int cmd, obd_off *offset)
-{
-        int rc;
-        ENTRY;
-        EXP_CHECK_DT_OP(exp, extent_calc);
-        rc = OBP(exp->exp_obd, extent_calc)(exp, md, cmd, offset);
-        RETURN(rc);
-}
-
-static inline struct dentry *
-obd_lvfs_fid2dentry(struct obd_export *exp, struct ost_id *oi, __u32 gen)
-{
-       struct lvfs_run_ctxt *ctxt = &exp->exp_obd->obd_lvfs_ctxt;
-       LASSERT(exp->exp_obd);
-
-       return ctxt->cb_ops.l_fid2dentry(ostid_id(oi), gen, ostid_seq(oi),
-                                        exp->exp_obd);
-}
-
 /* @max_age is the oldest time in jiffies that we accept using a cached data.
  * If the cache is older than @max_age we will get a new value from the
  * target.  Use a value of "cfs_time_current() + HZ" to guarantee freshness. */
@@ -1243,22 +1034,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.
@@ -1301,163 +1096,41 @@ static inline int obd_statfs(const struct lu_env *env, struct obd_export *exp,
        RETURN(rc);
 }
 
-static inline int obd_sync_rqset(struct obd_export *exp, struct obd_info *oinfo,
-                                 obd_size start, obd_size end)
-{
-        struct ptlrpc_request_set *set = NULL;
-        int rc;
-        ENTRY;
-
-        OBD_CHECK_DT_OP(exp->exp_obd, sync, -EOPNOTSUPP);
-        EXP_COUNTER_INCREMENT(exp, sync);
-
-        set =  ptlrpc_prep_set();
-        if (set == NULL)
-                RETURN(-ENOMEM);
-
-        rc = OBP(exp->exp_obd, sync)(NULL, exp, oinfo, start, end, set);
-        if (rc == 0)
-                rc = ptlrpc_set_wait(set);
-        ptlrpc_set_destroy(set);
-        RETURN(rc);
-}
-
-static inline int obd_sync(const struct lu_env *env, struct obd_export *exp,
-                           struct obd_info *oinfo, obd_size start, obd_size end,
-                           struct ptlrpc_request_set *set)
-{
-        int rc;
-        ENTRY;
-
-        OBD_CHECK_DT_OP(exp->exp_obd, sync, -EOPNOTSUPP);
-        EXP_COUNTER_INCREMENT(exp, sync);
-
-        rc = OBP(exp->exp_obd, sync)(env, exp, oinfo, start, end, set);
-        RETURN(rc);
-}
-
-static inline int obd_punch_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, punch);
-        EXP_COUNTER_INCREMENT(exp, punch);
-
-        set =  ptlrpc_prep_set();
-        if (set == NULL)
-                RETURN(-ENOMEM);
-
-        rc = OBP(exp->exp_obd, punch)(NULL, exp, oinfo, oti, set);
-        if (rc == 0)
-                rc = ptlrpc_set_wait(set);
-        ptlrpc_set_destroy(set);
-        RETURN(rc);
-}
-
-static inline int obd_punch(const struct lu_env *env, struct obd_export *exp,
-                            struct obd_info *oinfo, struct obd_trans_info *oti,
-                            struct ptlrpc_request_set *rqset)
-{
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, punch);
-        EXP_COUNTER_INCREMENT(exp, punch);
-
-        rc = OBP(exp->exp_obd, punch)(env, exp, oinfo, oti, rqset);
-        RETURN(rc);
-}
-
-static inline int obd_brw(int cmd, struct obd_export *exp,
-                          struct obd_info *oinfo, obd_count oa_bufs,
-                          struct brw_page *pg, struct obd_trans_info *oti)
-{
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, brw);
-        EXP_COUNTER_INCREMENT(exp, brw);
-
-        if (!(cmd & (OBD_BRW_RWMASK | OBD_BRW_CHECK))) {
-                CERROR("obd_brw: cmd must be OBD_BRW_READ, OBD_BRW_WRITE, "
-                       "or OBD_BRW_CHECK\n");
-                LBUG();
-        }
-
-        rc = OBP(exp->exp_obd, brw)(cmd, exp, oinfo, oa_bufs, pg, oti);
-        RETURN(rc);
-}
-
 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)
-{
-        ENTRY;
-
-        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, oti, rc);
-        RETURN(rc);
-}
-
-static inline int obd_merge_lvb(struct obd_export *exp,
-                                struct lov_stripe_md *lsm,
-                                struct ost_lvb *lvb, int kms_only)
-{
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, merge_lvb);
-        EXP_COUNTER_INCREMENT(exp, merge_lvb);
-
-        rc = OBP(exp->exp_obd, merge_lvb)(exp, lsm, lvb, kms_only);
-        RETURN(rc);
-}
-
-static inline int obd_adjust_kms(struct obd_export *exp,
-                                 struct lov_stripe_md *lsm, obd_off size,
-                                 int shrink)
+                              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)
 {
-        int rc;
-        ENTRY;
+       ENTRY;
 
-        EXP_CHECK_DT_OP(exp, adjust_kms);
-        EXP_COUNTER_INCREMENT(exp, adjust_kms);
+       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, adjust_kms)(exp, lsm, size, shrink);
-        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;
@@ -1469,128 +1142,6 @@ static inline int obd_iocontrol(unsigned int cmd, struct obd_export *exp,
         RETURN(rc);
 }
 
-static inline int obd_enqueue_rqset(struct obd_export *exp,
-                                    struct obd_info *oinfo,
-                                    struct ldlm_enqueue_info *einfo)
-{
-        struct ptlrpc_request_set *set = NULL;
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, enqueue);
-        EXP_COUNTER_INCREMENT(exp, enqueue);
-
-        set =  ptlrpc_prep_set();
-        if (set == NULL)
-                RETURN(-ENOMEM);
-
-        rc = OBP(exp->exp_obd, enqueue)(exp, oinfo, einfo, set);
-        if (rc == 0)
-                rc = ptlrpc_set_wait(set);
-        ptlrpc_set_destroy(set);
-        RETURN(rc);
-}
-
-static inline int obd_enqueue(struct obd_export *exp,
-                              struct obd_info *oinfo,
-                              struct ldlm_enqueue_info *einfo,
-                              struct ptlrpc_request_set *set)
-{
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, enqueue);
-        EXP_COUNTER_INCREMENT(exp, enqueue);
-
-        rc = OBP(exp->exp_obd, enqueue)(exp, oinfo, einfo, set);
-        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 int obd_cancel(struct obd_export *exp,
-                             struct lov_stripe_md *ea, __u32 mode,
-                             struct lustre_handle *lockh)
-{
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, cancel);
-        EXP_COUNTER_INCREMENT(exp, cancel);
-
-        rc = OBP(exp->exp_obd, cancel)(exp, ea, mode, lockh);
-        RETURN(rc);
-}
-
-static inline int obd_cancel_unused(struct obd_export *exp,
-                                    struct lov_stripe_md *ea,
-                                    ldlm_cancel_flags_t flags,
-                                    void *opaque)
-{
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, cancel_unused);
-        EXP_COUNTER_INCREMENT(exp, cancel_unused);
-
-        rc = OBP(exp->exp_obd, cancel_unused)(exp, ea, flags, opaque);
-        RETURN(rc);
-}
-
-static inline int obd_pin(struct obd_export *exp, const struct lu_fid *fid,
-                          struct obd_capa *oc, struct obd_client_handle *handle,
-                          int flag)
-{
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, pin);
-        EXP_COUNTER_INCREMENT(exp, pin);
-
-        rc = OBP(exp->exp_obd, pin)(exp, fid, oc, handle, flag);
-        RETURN(rc);
-}
-
-static inline int obd_unpin(struct obd_export *exp,
-                            struct obd_client_handle *handle, int flag)
-{
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, unpin);
-        EXP_COUNTER_INCREMENT(exp, unpin);
-
-        rc = OBP(exp->exp_obd, unpin)(exp, handle, flag);
-        RETURN(rc);
-}
-
-
 static inline void obd_import_event(struct obd_device *obd,
                                     struct obd_import *imp,
                                     enum obd_import_event event)
@@ -1608,20 +1159,6 @@ static inline void obd_import_event(struct obd_device *obd,
         EXIT;
 }
 
-static inline int obd_llog_connect(struct obd_export *exp,
-                                   struct llogd_conn_body *body)
-{
-        int rc;
-        ENTRY;
-
-        OBD_CHECK_DT_OP(exp->exp_obd, llog_connect, 0);
-        EXP_COUNTER_INCREMENT(exp, llog_connect);
-
-        rc = OBP(exp->exp_obd, llog_connect)(exp, body);
-        RETURN(rc);
-}
-
-
 static inline int obd_notify(struct obd_device *obd,
                              struct obd_device *watched,
                              enum obd_notify_event ev,
@@ -1631,11 +1168,7 @@ static inline int obd_notify(struct obd_device *obd,
         ENTRY;
         OBD_CHECK_DEV(obd);
 
-        /* the check for async_recov is a complete hack - I'm hereby
-           overloading the meaning to also mean "this was called from
-           mds_postsetup".  I know that my mds is able to handle notifies
-           by this point, and it needs to get them to execute mds_postrecov. */
-        if (!obd->obd_set_up && !obd->obd_async_recov) {
+       if (!obd->obd_set_up) {
                 CDEBUG(D_HA, "obd %s not set up\n", obd->obd_name);
                 RETURN(-EINVAL);
         }
@@ -1677,19 +1210,6 @@ static inline int obd_notify_observer(struct obd_device *observer,
         return rc1 ? rc1 : rc2;
 }
 
-static inline int obd_quotacheck(struct obd_export *exp,
-                                 struct obd_quotactl *oqctl)
-{
-        int rc;
-        ENTRY;
-
-        EXP_CHECK_DT_OP(exp, quotacheck);
-        EXP_COUNTER_INCREMENT(exp, quotacheck);
-
-        rc = OBP(exp->exp_obd, quotacheck)(exp->exp_obd, exp, oqctl);
-        RETURN(rc);
-}
-
 static inline int obd_quotactl(struct obd_export *exp,
                                struct obd_quotactl *oqctl)
 {
@@ -1745,93 +1265,18 @@ static inline int obd_register_observer(struct obd_device *obd,
         RETURN(0);
 }
 
-static inline int obd_pin_observer(struct obd_device *obd,
-                                   struct obd_device **observer)
-{
-        ENTRY;
-       down_read(&obd->obd_observer_link_sem);
-        if (!obd->obd_observer) {
-                *observer = NULL;
-               up_read(&obd->obd_observer_link_sem);
-                RETURN(-ENOENT);
-        }
-        *observer = obd->obd_observer;
-        RETURN(0);
-}
-
-static inline int obd_unpin_observer(struct obd_device *obd)
-{
-        ENTRY;
-       up_read(&obd->obd_observer_link_sem);
-        RETURN(0);
-}
-
-#if 0
-static inline int obd_register_page_removal_cb(struct obd_export *exp,
-                                               obd_page_removal_cb_t cb,
-                                               obd_pin_extent_cb pin_cb)
-{
-        int rc;
-        ENTRY;
-
-        OBD_CHECK_DT_OP(exp->exp_obd, register_page_removal_cb, 0);
-        OBD_COUNTER_INCREMENT(exp->exp_obd, register_page_removal_cb);
-
-        rc = OBP(exp->exp_obd, register_page_removal_cb)(exp, cb, pin_cb);
-        RETURN(rc);
-}
-
-static inline int obd_unregister_page_removal_cb(struct obd_export *exp,
-                                                 obd_page_removal_cb_t cb)
-{
-        int rc;
-        ENTRY;
-
-        OBD_CHECK_DT_OP(exp->exp_obd, unregister_page_removal_cb, 0);
-        OBD_COUNTER_INCREMENT(exp->exp_obd, unregister_page_removal_cb);
-
-        rc = OBP(exp->exp_obd, unregister_page_removal_cb)(exp, cb);
-        RETURN(rc);
-}
-
-static inline int obd_register_lock_cancel_cb(struct obd_export *exp,
-                                              obd_lock_cancel_cb cb)
-{
-        int rc;
-        ENTRY;
-
-        OBD_CHECK_DT_OP(exp->exp_obd, register_lock_cancel_cb, 0);
-        OBD_COUNTER_INCREMENT(exp->exp_obd, register_lock_cancel_cb);
-
-        rc = OBP(exp->exp_obd, register_lock_cancel_cb)(exp, cb);
-        RETURN(rc);
-}
-
-static inline int obd_unregister_lock_cancel_cb(struct obd_export *exp,
-                                                 obd_lock_cancel_cb cb)
-{
-        int rc;
-        ENTRY;
-
-        OBD_CHECK_DT_OP(exp->exp_obd, unregister_lock_cancel_cb, 0);
-        OBD_COUNTER_INCREMENT(exp->exp_obd, unregister_lock_cancel_cb);
-
-        rc = OBP(exp->exp_obd, unregister_lock_cancel_cb)(exp, cb);
-        RETURN(rc);
-}
-#endif
-
 /* 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,
@@ -1856,18 +1301,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)
@@ -1881,9 +1314,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;
@@ -1894,33 +1327,20 @@ 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,
-                             struct lookup_intent *it,
-                             struct md_op_data *op_data,
-                             struct lustre_handle *lockh,
-                             void *lmm, int lmmsize,
-                             struct ptlrpc_request **req,
-                             int extra_lock_flags)
+                            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)
 {
-        int rc;
-        ENTRY;
-        EXP_CHECK_MD_OP(exp, enqueue);
-        EXP_MD_COUNTER_INCREMENT(exp, enqueue);
-        rc = MDP(exp->exp_obd, enqueue)(exp, einfo, it, op_data, lockh,
-                                        lmm, lmmsize, req, extra_lock_flags);
+       int rc;
+       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,
+                                       extra_lock_flags);
         RETURN(rc);
 }
 
@@ -1937,20 +1357,19 @@ static inline int md_getattr_name(struct obd_export *exp,
 }
 
 static inline int md_intent_lock(struct obd_export *exp,
-                                struct md_op_data *op_data, void *lmm,
-                                int lmmsize, struct lookup_intent *it,
-                                int lookup_flags, struct ptlrpc_request **reqp,
+                                struct md_op_data *op_data,
+                                struct lookup_intent *it,
+                                struct ptlrpc_request **reqp,
                                 ldlm_blocking_callback cb_blocking,
                                 __u64 extra_lock_flags)
 {
-        int rc;
-        ENTRY;
-        EXP_CHECK_MD_OP(exp, intent_lock);
-        EXP_MD_COUNTER_INCREMENT(exp, intent_lock);
-        rc = MDP(exp->exp_obd, intent_lock)(exp, op_data, lmm, lmmsize,
-                                            it, lookup_flags, reqp, cb_blocking,
-                                            extra_lock_flags);
-        RETURN(rc);
+       int rc;
+       ENTRY;
+       EXP_CHECK_MD_OP(exp, intent_lock);
+       EXP_MD_COUNTER_INCREMENT(exp, intent_lock);
+       rc = MDP(exp->exp_obd, intent_lock)(exp, op_data, it, reqp, cb_blocking,
+                                           extra_lock_flags);
+       RETURN(rc);
 }
 
 static inline int md_link(struct obd_export *exp, struct md_op_data *op_data,
@@ -1965,8 +1384,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;
@@ -1977,54 +1396,44 @@ static inline int md_rename(struct obd_export *exp, struct md_op_data *op_data,
         RETURN(rc);
 }
 
-static inline int md_is_subdir(struct obd_export *exp,
-                               const struct lu_fid *pfid,
-                               const struct lu_fid *cfid,
-                               struct ptlrpc_request **request)
-{
-        int rc;
-        ENTRY;
-        EXP_CHECK_MD_OP(exp, is_subdir);
-        EXP_MD_COUNTER_INCREMENT(exp, is_subdir);
-        rc = MDP(exp->exp_obd, is_subdir)(exp, pfid, cfid, request);
-        RETURN(rc);
-}
-
 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);
 }
 
-static inline int md_readpage(struct obd_export *exp, struct md_op_data *opdata,
-                              struct page **pages,
-                              struct ptlrpc_request **request)
+static inline int md_read_page(struct obd_export *exp,
+                              struct md_op_data *op_data,
+                              struct md_callback *cb_op,
+                              __u64  hash_offset,
+                              struct page **ppage)
 {
-        int rc;
-        ENTRY;
-        EXP_CHECK_MD_OP(exp, readpage);
-        EXP_MD_COUNTER_INCREMENT(exp, readpage);
-        rc = MDP(exp->exp_obd, readpage)(exp, opdata, pages, request);
-        RETURN(rc);
+       int rc;
+       ENTRY;
+       EXP_CHECK_MD_OP(exp, read_page);
+       EXP_MD_COUNTER_INCREMENT(exp, read_page);
+       rc = MDP(exp->exp_obd, read_page)(exp, op_data, cb_op, hash_offset,
+                                         ppage);
+       RETURN(rc);
 }
 
 static inline int md_unlink(struct obd_export *exp, struct md_op_data *op_data,
@@ -2059,44 +1468,53 @@ 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_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_merge_attr(struct obd_export *exp,
+                               const struct lmv_stripe_md *lsm,
+                               struct cl_attr *attr,
+                               ldlm_blocking_callback cb)
 {
-        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, merge_attr);
+       EXP_MD_COUNTER_INCREMENT(exp, merge_attr);
+       RETURN(MDP(exp->exp_obd, merge_attr)(exp, lsm, attr, cb));
 }
 
-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_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, 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, 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,
+                             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, valid, name, input,
+                                          input_size, output_size, flags,
+                                          request));
 }
 
 static inline int md_set_open_replay_data(struct obd_export *exp,
-                                          struct obd_client_handle *och,
-                                          struct ptlrpc_request *open_req)
+                                         struct obd_client_handle *och,
+                                         struct lookup_intent *it)
 {
-        ENTRY;
-        EXP_CHECK_MD_OP(exp, set_open_replay_data);
-        EXP_MD_COUNTER_INCREMENT(exp, set_open_replay_data);
-        RETURN(MDP(exp->exp_obd, set_open_replay_data)(exp, och, open_req));
+       ENTRY;
+       EXP_CHECK_MD_OP(exp, set_open_replay_data);
+       EXP_MD_COUNTER_INCREMENT(exp, set_open_replay_data);
+       RETURN(MDP(exp->exp_obd, set_open_replay_data)(exp, och, it));
 }
 
 static inline int md_clear_open_replay_data(struct obd_export *exp,
@@ -2117,94 +1535,65 @@ 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)
+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));
+       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, ea_size, def_ea_size));
 }
 
 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)
+                                    const struct lu_fid *fid, u32 suppgid,
+                                    struct ptlrpc_request **request)
 {
-        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);
-}
+       ENTRY;
+       EXP_CHECK_MD_OP(exp, get_remote_perm);
+       EXP_MD_COUNTER_INCREMENT(exp, get_remote_perm);
 
-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, get_remote_perm)(exp, fid, suppgid, request));
 }
 
 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,
@@ -2219,6 +1608,37 @@ static inline int md_revalidate_lock(struct obd_export *exp,
         RETURN(rc);
 }
 
+static inline int md_get_fid_from_lsm(struct obd_export *exp,
+                                     const struct lmv_stripe_md *lsm,
+                                     const char *name, int namelen,
+                                     struct lu_fid *fid)
+{
+       int rc;
+       ENTRY;
+       EXP_CHECK_MD_OP(exp, get_fid_from_lsm);
+       EXP_MD_COUNTER_INCREMENT(exp, get_fid_from_lsm);
+       rc = MDP(exp->exp_obd, get_fid_from_lsm)(exp, lsm, name, namelen, fid);
+       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 */
 
@@ -2230,7 +1650,7 @@ extern struct kmem_cache *obdo_cachep;
 
 #define OBDO_ALLOC(ptr)                                                       \
 do {                                                                          \
-       OBD_SLAB_ALLOC_PTR_GFP((ptr), obdo_cachep, __GFP_IO);             \
+       OBD_SLAB_ALLOC_PTR_GFP((ptr), obdo_cachep, GFP_NOFS);             \
 } while(0)
 
 #define OBDO_FREE(ptr)                                                        \
@@ -2239,23 +1659,14 @@ do {                                                                          \
 } while(0)
 
 
-static inline void obdo2fid(struct obdo *oa, struct lu_fid *fid)
-{
-        /* something here */
-}
-
-static inline void fid2obdo(struct lu_fid *fid, struct obdo *oa)
-{
-        /* something here */
-}
-
 typedef int (*register_lwp_cb)(void *data);
 
 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];
 };
 
@@ -2270,8 +1681,13 @@ extern int (*ptlrpc_put_connection_superhack)(struct ptlrpc_connection *c);
 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);
-int tgt_name2lwpname(const char *tgt_name, char *lwp_name);
+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);
@@ -2289,11 +1705,31 @@ int class_check_uuid(struct obd_uuid *uuid, __u64 nid);
 void class_init_uuidlist(void);
 void class_exit_uuidlist(void);
 
-/* mea.c */
-int mea_name2idx(struct lmv_stripe_md *mea, const char *name, int namelen);
-int raw_name2idx(int hashtype, int count, const char *name, int namelen);
+/* 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 {
+       uid_t                   rsi_uid;
+       gid_t                   rsi_gid;
+       struct list_head        rsi_nosquash_nids;
+       struct rw_semaphore     rsi_sem;
+};
+
+int server_name2index(const char *svname, __u32 *idx, const char **endptr);
+
+/* linux-module.c */
+extern struct miscdevice obd_psdev;
+int class_procfs_init(void);
+int class_procfs_clean(void);
+
 #endif /* __LINUX_OBD_CLASS_H */