Whamcloud - gitweb
LU-13437 mdt: don't fetch LOOKUP lock for remote object
[fs/lustre-release.git] / lustre / include / obd_class.h
index 383bc9c..2b2f2fa 100644 (file)
@@ -23,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2016, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -32,7 +32,7 @@
 #ifndef __CLASS_OBD_H
 #define __CLASS_OBD_H
 
-
+#include <linux/kobject.h>
 #include <obd_support.h>
 #include <lustre_import.h>
 #include <lustre_net.h>
                                          * obd_osfs_age */
 #define OBD_STATFS_FOR_MDT0    0x0004  /* The statfs is only for retrieving
                                         * information from MDT0. */
+#define OBD_STATFS_SUM         0x0008  /* get aggregated statfs from MDT */
 
 extern rwlock_t obd_dev_lock;
 
 /* OBD Operations Declarations */
-extern struct obd_device *class_conn2obd(struct lustre_handle *);
 extern struct obd_device *class_exp2obd(struct obd_export *);
 extern int class_handle_ioctl(unsigned int cmd, unsigned long arg);
-int lustre_get_jobid(char *jobid);
+int lustre_get_jobid(char *jobid, size_t len);
 void lustre_jobid_clear(const char *jobid);
 void jobid_cache_fini(void);
 int jobid_cache_init(void);
+char *jobid_current(void);
+int jobid_set_current(char *jobid);
 
 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,
+#ifdef HAVE_SERVER_SUPPORT
+struct obd_type *class_add_symlinks(const char *name, bool enable_proc);
+#endif
+int class_register_type(const struct obd_ops *dt_ops,
+                       const struct md_ops *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);
@@ -80,17 +86,27 @@ struct obd_device *class_name2obd(const char *name);
 int class_uuid2dev(struct obd_uuid *uuid);
 struct obd_device *class_uuid2obd(struct obd_uuid *uuid);
 void class_obd_list(void);
-struct obd_device * class_find_client_obd(struct obd_uuid *tgt_uuid,
-                                          const char * typ_name,
-                                          struct obd_uuid *grp_uuid);
-struct obd_device * class_devices_in_group(struct obd_uuid *grp_uuid,
-                                           int *next);
-struct obd_device * class_num2obd(int num);
+struct obd_device *class_find_client_obd(struct obd_uuid *tgt_uuid,
+                                        const char *type_name,
+                                        struct obd_uuid *grp_uuid);
+struct obd_device *class_devices_in_group(struct obd_uuid *grp_uuid,
+                                         int *next);
+struct obd_device *class_num2obd(int num);
 int get_devices_count(void);
 
 int class_notify_sptlrpc_conf(const char *fsname, int namelen);
 
-char *obd_export_nid2str(struct obd_export *exp);
+static inline char *obd_export_nid2str(struct obd_export *exp)
+{
+       return exp->exp_connection == NULL ?
+              "<unknown>" : libcfs_nid2str(exp->exp_connection->c_peer.nid);
+}
+
+static inline char *obd_import_nid2str(struct obd_import *imp)
+{
+       return imp->imp_connection == NULL ?
+              "<unknown>" : libcfs_nid2str(imp->imp_connection->c_peer.nid);
+}
 
 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);
@@ -114,10 +130,8 @@ __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);
+__u16 obd_get_mod_rpc_slot(struct client_obd *cli, __u32 opc);
+void obd_put_mod_rpc_slot(struct client_obd *cli, __u32 opc, __u16 tag);
 
 struct llog_handle;
 struct llog_rec_hdr;
@@ -138,9 +152,11 @@ struct cfg_interop_param {
 char *lustre_cfg_string(struct lustre_cfg *lcfg, u32 index);
 struct lustre_cfg *lustre_cfg_rename(struct lustre_cfg *cfg,
                                     const char *new_name);
+void print_lustre_cfg(struct lustre_cfg *lcfg);
 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);
+ssize_t class_set_global(const char *param);
+ssize_t class_modify_config(struct lustre_cfg *lcfg, const char *prefix,
+                           struct kobject *kobj);
 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);
@@ -170,13 +186,11 @@ int class_add_conn(struct obd_device *obd, struct lustre_cfg *lcfg);
 #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 */
-#define CFG_F_COMPAT146 0x08   /* Allow old-style logs */
 #define CFG_F_EXCLUDE   0x10   /* OST exclusion list */
 
 /* Passed as data param to class_config_parse_llog */
 struct config_llog_instance {
-       char                    *cfg_obdname;
-       void                    *cfg_instance;
+       unsigned long            cfg_instance;
        struct super_block      *cfg_sb;
        struct obd_uuid          cfg_uuid;
        llog_cb_t                cfg_callback;
@@ -188,6 +202,19 @@ struct config_llog_instance {
 int class_config_parse_llog(const struct lu_env *env, struct llog_ctxt *ctxt,
                            char *name, struct config_llog_instance *cfg);
 
+/**
+ * Generate a unique configuration instance for this mount
+ *
+ * Temporary hack to bypass ASLR in 4.15+ kernels, a better fix soon.
+ * For now, use the same value as before - the superblock pointer value.
+ *
+ * Using the client UUID would be an option, but it needs more testing.
+ */
+static inline unsigned long ll_get_cfg_instance(struct super_block *sb)
+{
+       return (unsigned long)sb;
+}
+
 #define CONFIG_SUB_SPTLRPC     0x01
 #define CONFIG_SUB_RECOVER     0x02
 #define CONFIG_SUB_PARAMS      0x04
@@ -221,6 +248,7 @@ static inline bool logname_is_barrier(const char *logname)
 /* list of active configuration logs  */
 struct config_llog_data {
        struct ldlm_res_id          cld_resid;
+       struct lustre_handle        cld_lockh;
        struct config_llog_instance cld_cfg;
        struct list_head            cld_list_chain;/* on config_llog_list */
        atomic_t                    cld_refcount;
@@ -320,7 +348,7 @@ extern void (*class_export_dump_hook)(struct obd_export *);
 /* genops.c */
 struct obd_export *class_export_get(struct obd_export *exp);
 void class_export_put(struct obd_export *exp);
-struct obd_export *class_new_export(struct obd_device *obddev,
+struct obd_export *class_new_export(struct obd_device *obd,
                                     struct obd_uuid *cluuid);
 struct obd_export *class_new_export_self(struct obd_device *obd,
                                         struct obd_uuid *uuid);
@@ -331,18 +359,21 @@ void class_import_put(struct obd_import *);
 struct obd_import *class_new_import(struct obd_device *obd);
 void class_destroy_import(struct obd_import *exp);
 
+#ifdef HAVE_SERVER_SUPPORT
 struct obd_type *class_search_type(const char *name);
 struct obd_type *class_get_type(const char *name);
+#endif
 void class_put_type(struct obd_type *type);
 int class_connect(struct lustre_handle *conn, struct obd_device *obd,
                   struct obd_uuid *cluuid);
 int class_disconnect(struct obd_export *exp);
 void class_fail_export(struct obd_export *exp);
 int class_connected_export(struct obd_export *exp);
-void class_disconnect_exports(struct obd_device *obddev);
+void class_disconnect_exports(struct obd_device *obd);
 int class_manual_cleanup(struct obd_device *obd);
 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) |
@@ -380,20 +411,22 @@ void obdo_to_ioobj(const struct obdo *oa, struct obd_ioobj *ioobj);
 #define OBP(dev, op)    (dev)->obd_type->typ_dt_ops->o_ ## op
 #define MDP(dev, op)    (dev)->obd_type->typ_md_ops->m_ ## op
 
-/* Ensure obd_setup: used for cleanup which must be called
-   while obd is stopping */
-#define OBD_CHECK_DEV(obd)                                      \
-do {                                                            \
-        if (!(obd)) {                                           \
-                CERROR("NULL device\n");                        \
-                RETURN(-ENODEV);                                \
-        }                                                       \
-} while (0)
+static inline int obd_check_dev(struct obd_device *obd)
+{
+       if (!obd) {
+               CERROR("NULL device\n");
+               return -ENODEV;
+       }
+       return 0;
+}
 
 /* ensure obd_setup and !obd_stopping */
 #define OBD_CHECK_DEV_ACTIVE(obd)                               \
 do {                                                            \
-        OBD_CHECK_DEV(obd);                                     \
+       rc = obd_check_dev(obd);                                \
+       if (rc)                                                 \
+               return rc;                                      \
+                                                               \
         if (!(obd)->obd_set_up || (obd)->obd_stopping) {        \
                 CERROR("Device %d not setup\n",                 \
                        (obd)->obd_minor);                       \
@@ -402,61 +435,6 @@ do {                                                            \
 } while (0)
 
 
-#ifdef CONFIG_PROC_FS
-#define OBD_COUNTER_OFFSET(op)                                                \
-       ((offsetof(struct obd_ops, o_ ## op) -                                 \
-         offsetof(struct obd_ops, o_iocontrol))                               \
-        / sizeof(((struct obd_ops *)NULL)->o_iocontrol))
-
-/* The '- 1' below is for o_owner. */
-#define NUM_OBD_STATS                                                         \
-       (sizeof(struct obd_ops) /                                              \
-        sizeof(((struct obd_ops *)NULL)->o_iocontrol) - 1)
-
-#define OBD_COUNTER_INCREMENT(obd, op)                                        \
-       lprocfs_counter_incr((obd)->obd_stats,                                 \
-                            (obd)->obd_cntr_base + OBD_COUNTER_OFFSET(op))
-
-#define EXP_COUNTER_INCREMENT(exp, op)                                        \
-       do {                                                                   \
-               unsigned int _off;                                             \
-               _off = (exp)->exp_obd->obd_cntr_base + OBD_COUNTER_OFFSET(op); \
-               lprocfs_counter_incr((exp)->exp_obd->obd_stats, _off);         \
-               if ((exp)->exp_obd->obd_uses_nid_stats &&                      \
-                   (exp)->exp_nid_stats != NULL)                              \
-                       lprocfs_counter_incr((exp)->exp_nid_stats->nid_stats,  \
-                                            _off);                            \
-       } while (0)
-
-#define _MD_COUNTER_OFFSET(m_op)                                              \
-       ((offsetof(struct md_ops, m_op) -                                      \
-         offsetof(struct md_ops, MD_STATS_FIRST_OP)) /                        \
-        sizeof(((struct md_ops *)NULL)->MD_STATS_FIRST_OP))
-
-#define MD_COUNTER_OFFSET(op) _MD_COUNTER_OFFSET(m_ ## op)
-
-#define NUM_MD_STATS                                                          \
-       (_MD_COUNTER_OFFSET(MD_STATS_LAST_OP) -                                \
-        _MD_COUNTER_OFFSET(MD_STATS_FIRST_OP) + 1)
-
-/* Note that we only increment md counters for ops whose offset is less
- * than NUM_MD_STATS. This is explained in a comment in the definition
- * of struct md_ops. */
-#define EXP_MD_COUNTER_INCREMENT(exp, op)                                     \
-       do {                                                                   \
-               if (MD_COUNTER_OFFSET(op) < NUM_MD_STATS)                      \
-                       lprocfs_counter_incr((exp)->exp_obd->obd_md_stats,     \
-                                       (exp)->exp_obd->obd_md_cntr_base +     \
-                                       MD_COUNTER_OFFSET(op));                \
-       } while (0)
-
-#else
-#define OBD_COUNTER_OFFSET(op)
-#define OBD_COUNTER_INCREMENT(obd, op)
-#define EXP_COUNTER_INCREMENT(exp, op)
-#define EXP_MD_COUNTER_INCREMENT(exp, op)
-#endif
-
 static inline int lprocfs_nid_ldlm_stats_init(struct nid_stat* tmp)
 {
        /* Always add in ldlm_stats */
@@ -504,7 +482,6 @@ static inline int obd_get_info(const struct lu_env *env, struct obd_export *exp,
                       (exp)->exp_obd->obd_name, __func__);
                RETURN(-ENOTSUPP);
        }
-       EXP_COUNTER_INCREMENT(exp, get_info);
 
        rc = OBP(exp->exp_obd, get_info)(env, exp, keylen, key, vallen, val);
        RETURN(rc);
@@ -528,7 +505,6 @@ static inline int obd_set_info_async(const struct lu_env *env,
                       (exp)->exp_obd->obd_name, __func__);
                RETURN(-ENOTSUPP);
        }
-        EXP_COUNTER_INCREMENT(exp, set_info_async);
 
         rc = OBP(exp->exp_obd, set_info_async)(env, exp, keylen, key, vallen,
                                                val, set);
@@ -555,43 +531,46 @@ static inline int obd_set_info_async(const struct lu_env *env,
 static inline int obd_setup(struct obd_device *obd, struct lustre_cfg *cfg)
 {
         int rc;
-       struct lu_device_type *ldt = obd->obd_type->typ_lu;
-       struct lu_device *d;
+       struct obd_type *type = obd->obd_type;
+       struct lu_device_type *ldt;
 
-        ENTRY;
+       ENTRY;
 
-        if (ldt != NULL) {
-                struct lu_context  session_ctx;
-                struct lu_env env;
-                lu_context_init(&session_ctx, LCT_SESSION | LCT_SERVER_SESSION);
-                session_ctx.lc_thread = NULL;
-                lu_context_enter(&session_ctx);
+       wait_var_event(&type->typ_lu,
+                      smp_load_acquire(&type->typ_lu) != OBD_LU_TYPE_SETUP);
+       ldt = type->typ_lu;
+       if (ldt != NULL) {
+               struct lu_context session_ctx;
+               struct lu_env env;
 
-                rc = lu_env_init(&env, ldt->ldt_ctx_tags);
-                if (rc == 0) {
-                        env.le_ses = &session_ctx;
-                        d = ldt->ldt_ops->ldto_device_alloc(&env, ldt, cfg);
-                        lu_env_fini(&env);
-                        if (!IS_ERR(d)) {
-                                obd->obd_lu_dev = d;
-                                d->ld_obd = obd;
-                                rc = 0;
-                        } else
-                                rc = PTR_ERR(d);
-                }
-                lu_context_exit(&session_ctx);
-                lu_context_fini(&session_ctx);
+               lu_context_init(&session_ctx, LCT_SESSION | LCT_SERVER_SESSION);
+               session_ctx.lc_thread = NULL;
+               lu_context_enter(&session_ctx);
 
-        } else {
+               rc = lu_env_init(&env, ldt->ldt_ctx_tags);
+               if (rc == 0) {
+                       struct lu_device *dev;
+                       env.le_ses = &session_ctx;
+                       dev = ldt->ldt_ops->ldto_device_alloc(&env, ldt, cfg);
+                       lu_env_fini(&env);
+                       if (!IS_ERR(dev)) {
+                               obd->obd_lu_dev = dev;
+                               dev->ld_obd = obd;
+                               rc = 0;
+                       } else
+                               rc = PTR_ERR(dev);
+               }
+               lu_context_exit(&session_ctx);
+               lu_context_fini(&session_ctx);
+       } else {
                if (!obd->obd_type->typ_dt_ops->o_setup) {
                        CERROR("%s: no %s operation\n", obd->obd_name,
                               __func__);
                        RETURN(-EOPNOTSUPP);
                }
-                OBD_COUNTER_INCREMENT(obd, setup);
-                rc = OBP(obd, setup)(obd, cfg);
-        }
-        RETURN(rc);
+               rc = OBP(obd, setup)(obd, cfg);
+       }
+       RETURN(rc);
 }
 
 static inline int obd_precleanup(struct obd_device *obd)
@@ -603,20 +582,25 @@ static inline int obd_precleanup(struct obd_device *obd)
        ENTRY;
 
        if (ldt != NULL && d != NULL) {
-               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);
+               struct lu_env *env = lu_env_find();
+               struct lu_env _env;
+
+               if (!env) {
+                       env = &_env;
+                       rc = lu_env_init(env, ldt->ldt_ctx_tags);
+                       LASSERT(rc == 0);
+                       lu_env_add(env);
+               }
+               ldt->ldt_ops->ldto_device_fini(env, d);
+               if (env == &_env) {
+                       lu_env_remove(env);
+                       lu_env_fini(env);
                }
        }
 
        if (!obd->obd_type->typ_dt_ops->o_precleanup)
                RETURN(0);
 
-       OBD_COUNTER_INCREMENT(obd, precleanup);
-
        rc = OBP(obd, precleanup)(obd);
        RETURN(rc);
 }
@@ -641,8 +625,6 @@ static inline int obd_cleanup(struct obd_device *obd)
        if (!obd->obd_type->typ_dt_ops->o_cleanup)
                RETURN(0);
 
-        OBD_COUNTER_INCREMENT(obd, cleanup);
-
         rc = OBP(obd, cleanup)(obd);
         RETURN(rc);
 }
@@ -694,7 +676,7 @@ static inline int obd_process_config(struct obd_device *obd, int datalen,
                }
                 rc = OBP(obd, process_config)(obd, datalen, data);
         }
-        OBD_COUNTER_INCREMENT(obd, process_config);
+
         obd->obd_process_conf = 0;
 
         RETURN(rc);
@@ -715,7 +697,6 @@ static inline int obd_create(const struct lu_env *env, struct obd_export *exp,
                       (exp)->exp_obd->obd_name, __func__);
                RETURN(-ENOTSUPP);
        }
-       EXP_COUNTER_INCREMENT(exp, create);
 
        rc = OBP(exp->exp_obd, create)(env, exp, obdo);
        RETURN(rc);
@@ -736,7 +717,6 @@ static inline int obd_destroy(const struct lu_env *env, struct obd_export *exp,
                       (exp)->exp_obd->obd_name, __func__);
                RETURN(-ENOTSUPP);
        }
-       EXP_COUNTER_INCREMENT(exp, destroy);
 
        rc = OBP(exp->exp_obd, destroy)(env, exp, obdo);
        RETURN(rc);
@@ -757,7 +737,7 @@ static inline int obd_getattr(const struct lu_env *env, struct obd_export *exp,
                       (exp)->exp_obd->obd_name, __func__);
                RETURN(-ENOTSUPP);
        }
-       EXP_COUNTER_INCREMENT(exp, getattr);
+
        rc = OBP(exp->exp_obd, getattr)(env, exp, oa);
 
        RETURN(rc);
@@ -778,7 +758,7 @@ static inline int obd_setattr(const struct lu_env *env, struct obd_export *exp,
                       (exp)->exp_obd->obd_name, __func__);
                RETURN(-ENOTSUPP);
        }
-       EXP_COUNTER_INCREMENT(exp, setattr);
+
        rc = OBP(exp->exp_obd, setattr)(env, exp, oa);
 
        RETURN(rc);
@@ -796,7 +776,6 @@ static inline int obd_add_conn(struct obd_import *imp, struct obd_uuid *uuid,
                CERROR("%s: no %s operation\n", obd->obd_name, __func__);
                RETURN(-EOPNOTSUPP);
        }
-        OBD_COUNTER_INCREMENT(obd, add_conn);
 
         rc = OBP(obd, add_conn)(imp, uuid, priority);
         RETURN(rc);
@@ -813,7 +792,6 @@ static inline int obd_del_conn(struct obd_import *imp, struct obd_uuid *uuid)
                CERROR("%s: no %s operation\n", obd->obd_name, __func__);
                RETURN(-EOPNOTSUPP);
        }
-        OBD_COUNTER_INCREMENT(obd, del_conn);
 
         rc = OBP(obd, del_conn)(imp, uuid);
         RETURN(rc);
@@ -828,8 +806,6 @@ static inline struct obd_uuid *obd_get_uuid(struct obd_export *exp)
            !exp->exp_obd->obd_type->typ_dt_ops->o_get_uuid)
                RETURN(NULL);
 
-        EXP_COUNTER_INCREMENT(exp, get_uuid);
-
         uuid = OBP(exp->exp_obd, get_uuid)(exp);
         RETURN(uuid);
 }
@@ -855,7 +831,6 @@ static inline int obd_connect(const struct lu_env *env,
                CERROR("%s: no %s operation\n", obd->obd_name, __func__);
                RETURN(-EOPNOTSUPP);
        }
-        OBD_COUNTER_INCREMENT(obd, connect);
 
         rc = OBP(obd, connect)(env, exp, obd, cluuid, data, localdata);
         /* check that only subset is granted */
@@ -881,8 +856,6 @@ static inline int obd_reconnect(const struct lu_env *env,
        if (!obd->obd_type || !obd->obd_type->typ_dt_ops->o_reconnect)
                RETURN(0);
 
-        OBD_COUNTER_INCREMENT(obd, reconnect);
-
         rc = OBP(obd, reconnect)(env, exp, obd, cluuid, d, localdata);
         /* check that only subset is granted */
         LASSERT(ergo(d != NULL,
@@ -903,7 +876,6 @@ static inline int obd_disconnect(struct obd_export *exp)
                       (exp)->exp_obd->obd_name, __func__);
                RETURN(-ENOTSUPP);
        }
-        EXP_COUNTER_INCREMENT(exp, disconnect);
 
         rc = OBP(exp->exp_obd, disconnect)(exp);
         RETURN(rc);
@@ -917,7 +889,6 @@ static inline int obd_fid_init(struct obd_device *obd, struct obd_export *exp,
 
        if (!obd->obd_type || !obd->obd_type->typ_dt_ops->o_fid_init)
                RETURN(0);
-       OBD_COUNTER_INCREMENT(obd, fid_init);
 
        rc = OBP(obd, fid_init)(obd, exp, type);
        RETURN(rc);
@@ -929,7 +900,6 @@ static inline int obd_fid_fini(struct obd_device *obd)
        ENTRY;
        if (!obd->obd_type || !obd->obd_type->typ_dt_ops->o_fid_fini)
                RETURN(0);
-       OBD_COUNTER_INCREMENT(obd, fid_fini);
 
        rc = OBP(obd, fid_fini)(obd);
        RETURN(rc);
@@ -951,27 +921,11 @@ static inline int obd_fid_alloc(const struct lu_env *env,
                       (exp)->exp_obd->obd_name, __func__);
                RETURN(-ENOTSUPP);
        }
-       EXP_COUNTER_INCREMENT(exp, fid_alloc);
 
        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)
-{
-        int rc;
-        ENTRY;
-
-       if (!exp->exp_obd->obd_type ||
-           !exp->exp_obd->obd_type->typ_dt_ops->o_ping)
-               RETURN(0);
-
-        EXP_COUNTER_INCREMENT(exp, ping);
-
-        rc = OBP(exp->exp_obd, ping)(env, exp);
-        RETURN(rc);
-}
-
 static inline int obd_pool_new(struct obd_device *obd, char *poolname)
 {
         int rc;
@@ -981,7 +935,6 @@ static inline int obd_pool_new(struct obd_device *obd, char *poolname)
                CERROR("%s: no %s operation\n", obd->obd_name, __func__);
                RETURN(-EOPNOTSUPP);
        }
-        OBD_COUNTER_INCREMENT(obd, pool_new);
 
         rc = OBP(obd, pool_new)(obd, poolname);
         RETURN(rc);
@@ -995,7 +948,6 @@ static inline int obd_pool_del(struct obd_device *obd, char *poolname)
                CERROR("%s: no %s operation\n", obd->obd_name, __func__);
                RETURN(-EOPNOTSUPP);
        }
-        OBD_COUNTER_INCREMENT(obd, pool_del);
 
         rc = OBP(obd, pool_del)(obd, poolname);
         RETURN(rc);
@@ -1011,7 +963,6 @@ static inline int obd_pool_add(struct obd_device *obd, char *poolname,
                CERROR("%s: no %s operation\n", obd->obd_name, __func__);
                RETURN(-EOPNOTSUPP);
        }
-        OBD_COUNTER_INCREMENT(obd, pool_add);
 
         rc = OBP(obd, pool_add)(obd, poolname, ostname);
         RETURN(rc);
@@ -1027,32 +978,11 @@ static inline int obd_pool_rem(struct obd_device *obd, char *poolname,
                CERROR("%s: no %s operation\n", obd->obd_name, __func__);
                RETURN(-EOPNOTSUPP);
        }
-       OBD_COUNTER_INCREMENT(obd, pool_rem);
 
        rc = OBP(obd, pool_rem)(obd, poolname, ostname);
        RETURN(rc);
 }
 
-static inline void obd_getref(struct obd_device *obd)
-{
-       ENTRY;
-       if (obd->obd_type && OBP(obd, getref)) {
-               OBD_COUNTER_INCREMENT(obd, getref);
-               OBP(obd, getref)(obd);
-       }
-       EXIT;
-}
-
-static inline void obd_putref(struct obd_device *obd)
-{
-       ENTRY;
-       if (obd->obd_type && OBP(obd, putref)) {
-               OBD_COUNTER_INCREMENT(obd, putref);
-               OBP(obd, putref)(obd);
-       }
-       EXIT;
-}
-
 static inline int obd_init_export(struct obd_export *exp)
 {
        int rc = 0;
@@ -1073,16 +1003,17 @@ static inline int obd_destroy_export(struct obd_export *exp)
        RETURN(0);
 }
 
-/* @max_age is the oldest time in jiffies that we accept using a cached data.
+/* @max_age is the oldest time in seconds 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. */
+ * target. Use a value of 'ktime_get_seconds() + X' to guarantee freshness.
+ */
 static inline int obd_statfs_async(struct obd_export *exp,
                                   struct obd_info *oinfo,
-                                  __u64 max_age,
+                                  time64_t max_age,
                                   struct ptlrpc_request_set *rqset)
 {
-       int rc = 0;
        struct obd_device *obd;
+       int rc = 0;
 
        ENTRY;
 
@@ -1091,65 +1022,75 @@ static inline int obd_statfs_async(struct obd_export *exp,
 
        obd = exp->exp_obd;
        if (!obd->obd_type || !obd->obd_type->typ_dt_ops->o_statfs) {
-               CERROR("%s: no %s operation\n", obd->obd_name, __func__);
-               RETURN(-EOPNOTSUPP);
+               rc = -EOPNOTSUPP;
+               CERROR("%s: no statfs operation: rc = %d\n", obd->obd_name, rc);
+               RETURN(rc);
        }
-       OBD_COUNTER_INCREMENT(obd, statfs);
 
-       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 %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);
-               spin_lock(&obd->obd_osfs_lock);
-               memcpy(oinfo->oi_osfs, &obd->obd_osfs,
-                      sizeof(*oinfo->oi_osfs));
-               spin_unlock(&obd->obd_osfs_lock);
-               oinfo->oi_flags |= OBD_STATFS_FROM_CACHE;
-               if (oinfo->oi_cb_up)
-                       oinfo->oi_cb_up(oinfo, 0);
-       }
+       CDEBUG(D_SUPER, "%s: age %lld, max_age %lld\n",
+              obd->obd_name, obd->obd_osfs_age, max_age);
+       rc = OBP(obd, statfs_async)(exp, oinfo, max_age, rqset);
+
        RETURN(rc);
 }
 
-/* @max_age is the oldest time in jiffies that we accept using a cached data.
+/* @max_age is the oldest time in seconds 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. */
+ * target. Use a value of 'ktime_get_seconds() + X' to guarantee freshness.
+ */
 static inline int obd_statfs(const struct lu_env *env, struct obd_export *exp,
-                             struct obd_statfs *osfs, __u64 max_age,
-                             __u32 flags)
+                            struct obd_statfs *osfs, time64_t max_age,
+                            __u32 flags)
 {
-        int rc = 0;
-        struct obd_device *obd = exp->exp_obd;
-        ENTRY;
+       struct obd_device *obd = exp->exp_obd;
+       int rc = 0;
 
-        if (obd == NULL)
-                RETURN(-EINVAL);
+       ENTRY;
+       if (unlikely(obd == NULL))
+               RETURN(-EINVAL);
 
-       if (!obd->obd_type || !obd->obd_type->typ_dt_ops->o_statfs) {
+       OBD_CHECK_DEV_ACTIVE(obd);
+
+       if (unlikely(!obd->obd_type || !obd->obd_type->typ_dt_ops->o_statfs)) {
                CERROR("%s: no %s operation\n", obd->obd_name, __func__);
                RETURN(-EOPNOTSUPP);
        }
-        OBD_COUNTER_INCREMENT(obd, statfs);
 
-       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);
-                if (rc == 0) {
+       CDEBUG(D_SUPER, "%s: age %lld, max_age %lld\n",
+              obd->obd_name, obd->obd_osfs_age, max_age);
+       /* ignore cache if aggregated isn't expected */
+       if (obd->obd_osfs_age < max_age ||
+           ((obd->obd_osfs.os_state & OS_STATFS_SUM) &&
+            !(flags & OBD_STATFS_SUM))) {
+               /* the RPC will block anyway, so avoid sending many at once */
+               rc = mutex_lock_interruptible(&obd->obd_dev_mutex);
+               if (rc)
+                       RETURN(rc);
+               if (obd->obd_osfs_age < max_age ||
+                   ((obd->obd_osfs.os_state & OS_STATFS_SUM) &&
+                    !(flags & OBD_STATFS_SUM))) {
+                       rc = OBP(obd, statfs)(env, exp, osfs, max_age, flags);
+               } else {
+                       mutex_unlock(&obd->obd_dev_mutex);
+                       GOTO(cached, rc = 0);
+               }
+               if (rc == 0) {
+                       CDEBUG(D_SUPER,
+                              "%s: update %p cache blocks %llu/%llu objects %llu/%llu\n",
+                              obd->obd_name, &obd->obd_osfs,
+                              osfs->os_bavail, osfs->os_blocks,
+                              osfs->os_ffree, osfs->os_files);
+
                        spin_lock(&obd->obd_osfs_lock);
                        memcpy(&obd->obd_osfs, osfs, sizeof(obd->obd_osfs));
-                       obd->obd_osfs_age = cfs_time_current_64();
+                       obd->obd_osfs_age = ktime_get_seconds();
                        spin_unlock(&obd->obd_osfs_lock);
                }
+               mutex_unlock(&obd->obd_dev_mutex);
        } else {
-               CDEBUG(D_SUPER, "%s: use %p cache blocks %llu/%llu"
-                      " objects %llu/%llu\n",
+cached:
+               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);
@@ -1179,7 +1120,7 @@ static inline int obd_preprw(const struct lu_env *env, int cmd,
                       (exp)->exp_obd->obd_name, __func__);
                RETURN(-ENOTSUPP);
        }
-       EXP_COUNTER_INCREMENT(exp, preprw);
+
        rc = OBP(exp->exp_obd, preprw)(env, cmd, exp, oa, objcount, obj, remote,
                                       pages, local);
 
@@ -1190,8 +1131,9 @@ 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, int rc)
+                              struct niobuf_local *local, const int orig_rc)
 {
+       int rc;
        ENTRY;
 
        rc = exp_check_ops(exp);
@@ -1203,9 +1145,9 @@ static inline int obd_commitrw(const struct lu_env *env, int cmd,
                       (exp)->exp_obd->obd_name, __func__);
                RETURN(-ENOTSUPP);
        }
-       EXP_COUNTER_INCREMENT(exp, commitrw);
+
        rc = OBP(exp->exp_obd, commitrw)(env, cmd, exp, oa, objcount, obj,
-                                        rnb, pages, local, rc);
+                                        rnb, pages, local, orig_rc);
 
        RETURN(rc);
 }
@@ -1225,7 +1167,6 @@ static inline int obd_iocontrol(unsigned int cmd, struct obd_export *exp,
                       (exp)->exp_obd->obd_name, __func__);
                RETURN(-ENOTSUPP);
        }
-        EXP_COUNTER_INCREMENT(exp, iocontrol);
 
         rc = OBP(exp->exp_obd, iocontrol)(cmd, exp, len, karg, uarg);
         RETURN(rc);
@@ -1241,10 +1182,10 @@ static inline void obd_import_event(struct obd_device *obd,
                 EXIT;
                 return;
         }
-        if (obd->obd_set_up && OBP(obd, import_event)) {
-                OBD_COUNTER_INCREMENT(obd, import_event);
+
+        if (obd->obd_set_up && OBP(obd, import_event))
                 OBP(obd, import_event)(obd, imp, event);
-        }
+
         EXIT;
 }
 
@@ -1254,7 +1195,10 @@ static inline int obd_notify(struct obd_device *obd,
 {
        int rc;
        ENTRY;
-       OBD_CHECK_DEV(obd);
+
+       rc = obd_check_dev(obd);
+       if (rc)
+               return rc;
 
        if (!obd->obd_set_up) {
                CDEBUG(D_HA, "obd %s not set up\n", obd->obd_name);
@@ -1266,7 +1210,6 @@ static inline int obd_notify(struct obd_device *obd,
                RETURN(-ENOSYS);
        }
 
-       OBD_COUNTER_INCREMENT(obd, notify);
        rc = OBP(obd, notify)(obd, watched, ev);
 
        RETURN(rc);
@@ -1308,7 +1251,6 @@ static inline int obd_quotactl(struct obd_export *exp,
                       (exp)->exp_obd->obd_name, __func__);
                RETURN(-ENOTSUPP);
        }
-        EXP_COUNTER_INCREMENT(exp, quotactl);
 
         rc = OBP(exp->exp_obd, quotactl)(exp->exp_obd, exp, oqctl);
         RETURN(rc);
@@ -1345,8 +1287,13 @@ static inline int obd_health_check(const struct lu_env *env,
 static inline int obd_register_observer(struct obd_device *obd,
                                         struct obd_device *observer)
 {
+       int rc;
         ENTRY;
-        OBD_CHECK_DEV(obd);
+
+       rc = obd_check_dev(obd);
+       if (rc)
+               return rc;
+
        down_write(&obd->obd_observer_link_sem);
         if (obd->obd_observer && observer) {
                up_write(&obd->obd_observer_link_sem);
@@ -1358,19 +1305,35 @@ static inline int obd_register_observer(struct obd_device *obd,
 }
 
 /* metadata helpers */
+enum mps_stat_idx {
+       LPROC_MD_CLOSE,
+       LPROC_MD_CREATE,
+       LPROC_MD_ENQUEUE,
+       LPROC_MD_GETATTR,
+       LPROC_MD_INTENT_LOCK,
+       LPROC_MD_LINK,
+       LPROC_MD_RENAME,
+       LPROC_MD_SETATTR,
+       LPROC_MD_FSYNC,
+       LPROC_MD_READ_PAGE,
+       LPROC_MD_UNLINK,
+       LPROC_MD_SETXATTR,
+       LPROC_MD_GETXATTR,
+       LPROC_MD_INTENT_GETATTR_ASYNC,
+       LPROC_MD_REVALIDATE_LOCK,
+       LPROC_MD_LAST_OPC,
+};
+
 static inline int md_get_root(struct obd_export *exp, const char *fileset,
                              struct lu_fid *fid)
 {
        int rc;
 
-       ENTRY;
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-       EXP_MD_COUNTER_INCREMENT(exp, get_root);
-       rc = MDP(exp->exp_obd, get_root)(exp, fileset, fid);
+               return rc;
 
-       RETURN(rc);
+       return MDP(exp->exp_obd, get_root)(exp, fileset, fid);
 }
 
 static inline int md_getattr(struct obd_export *exp,
@@ -1379,40 +1342,42 @@ static inline int md_getattr(struct obd_export *exp,
 {
        int rc;
 
-       ENTRY;
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-       EXP_MD_COUNTER_INCREMENT(exp, getattr);
-       rc = MDP(exp->exp_obd, getattr)(exp, op_data, request);
-       RETURN(rc);
+               return rc;
+
+       lprocfs_counter_incr(exp->exp_obd->obd_md_stats,
+                            LPROC_MD_GETATTR);
+
+       return MDP(exp->exp_obd, getattr)(exp, op_data, request);
 }
 
 static inline int md_null_inode(struct obd_export *exp,
                                    const struct lu_fid *fid)
 {
-        int rc;
-        ENTRY;
+       int rc;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-        EXP_MD_COUNTER_INCREMENT(exp, null_inode);
-        rc = MDP(exp->exp_obd, null_inode)(exp, fid);
-        RETURN(rc);
+               return rc;
+
+       return MDP(exp->exp_obd, null_inode)(exp, fid);
 }
 
 static inline int md_close(struct obd_export *exp, struct md_op_data *op_data,
                            struct md_open_data *mod,
                            struct ptlrpc_request **request)
 {
-        int rc;
-        ENTRY;
+       int rc;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-        EXP_MD_COUNTER_INCREMENT(exp, close);
-        rc = MDP(exp->exp_obd, close)(exp, op_data, mod, request);
-        RETURN(rc);
+               return rc;
+
+       lprocfs_counter_incr(exp->exp_obd->obd_md_stats,
+                            LPROC_MD_CLOSE);
+
+       return MDP(exp->exp_obd, close)(exp, op_data, mod, request);
 }
 
 static inline int md_create(struct obd_export *exp, struct md_op_data *op_data,
@@ -1420,15 +1385,18 @@ static inline int md_create(struct obd_export *exp, struct md_op_data *op_data,
                            uid_t uid, gid_t gid, cfs_cap_t cap_effective,
                            __u64 rdev, struct ptlrpc_request **request)
 {
-        int rc;
-        ENTRY;
+       int rc;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-        EXP_MD_COUNTER_INCREMENT(exp, create);
-        rc = MDP(exp->exp_obd, create)(exp, op_data, data, datalen, mode,
-                                       uid, gid, cap_effective, rdev, request);
-        RETURN(rc);
+               return rc;
+
+       lprocfs_counter_incr(exp->exp_obd->obd_md_stats,
+                            LPROC_MD_CREATE);
+
+       return MDP(exp->exp_obd, create)(exp, op_data, data, datalen, mode,
+                                        uid, gid, cap_effective, rdev,
+                                        request);
 }
 
 static inline int md_enqueue(struct obd_export *exp,
@@ -1439,28 +1407,29 @@ static inline int md_enqueue(struct obd_export *exp,
                             __u64 extra_lock_flags)
 {
        int rc;
-       ENTRY;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-       EXP_MD_COUNTER_INCREMENT(exp, enqueue);
-       rc = MDP(exp->exp_obd, enqueue)(exp, einfo, policy, op_data, lockh,
-                                       extra_lock_flags);
-        RETURN(rc);
+               return rc;
+
+       lprocfs_counter_incr(exp->exp_obd->obd_md_stats,
+                            LPROC_MD_ENQUEUE);
+
+       return MDP(exp->exp_obd, enqueue)(exp, einfo, policy, op_data, lockh,
+                  extra_lock_flags);
 }
 
 static inline int md_getattr_name(struct obd_export *exp,
                                   struct md_op_data *op_data,
                                   struct ptlrpc_request **request)
 {
-        int rc;
-        ENTRY;
+       int rc;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-        EXP_MD_COUNTER_INCREMENT(exp, getattr_name);
-        rc = MDP(exp->exp_obd, getattr_name)(exp, op_data, request);
-        RETURN(rc);
+               return rc;
+
+       return MDP(exp->exp_obd, getattr_name)(exp, op_data, request);
 }
 
 static inline int md_intent_lock(struct obd_export *exp,
@@ -1471,43 +1440,49 @@ static inline int md_intent_lock(struct obd_export *exp,
                                 __u64 extra_lock_flags)
 {
        int rc;
-       ENTRY;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-       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);
+               return rc;
+
+       lprocfs_counter_incr(exp->exp_obd->obd_md_stats,
+                            LPROC_MD_INTENT_LOCK);
+
+       return MDP(exp->exp_obd, intent_lock)(exp, op_data, it, reqp,
+                                             cb_blocking, extra_lock_flags);
 }
 
 static inline int md_link(struct obd_export *exp, struct md_op_data *op_data,
                           struct ptlrpc_request **request)
 {
-        int rc;
-        ENTRY;
+       int rc;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-        EXP_MD_COUNTER_INCREMENT(exp, link);
-        rc = MDP(exp->exp_obd, link)(exp, op_data, request);
-        RETURN(rc);
+               return rc;
+
+       lprocfs_counter_incr(exp->exp_obd->obd_md_stats,
+                            LPROC_MD_LINK);
+
+       return MDP(exp->exp_obd, link)(exp, op_data, request);
 }
 
 static inline int md_rename(struct obd_export *exp, struct md_op_data *op_data,
-                           const char *old, size_t oldlen, const char *new,
-                           size_t newlen, struct ptlrpc_request **request)
+                           const char *old_name, size_t oldlen,
+                           const char *new_name, size_t newlen,
+                           struct ptlrpc_request **request)
 {
-        int rc;
-        ENTRY;
+       int rc;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
+               return rc;
 
-        EXP_MD_COUNTER_INCREMENT(exp, rename);
-        rc = MDP(exp->exp_obd, rename)(exp, op_data, old, oldlen, new,
-                                       newlen, request);
-        RETURN(rc);
+       lprocfs_counter_incr(exp->exp_obd->obd_md_stats,
+                            LPROC_MD_RENAME);
+
+       return MDP(exp->exp_obd, rename)(exp, op_data, old_name, oldlen,
+                                        new_name, newlen, request);
 }
 
 static inline int md_setattr(struct obd_export *exp, struct md_op_data *op_data,
@@ -1515,14 +1490,15 @@ static inline int md_setattr(struct obd_export *exp, struct md_op_data *op_data,
                             struct ptlrpc_request **request)
 {
        int rc;
-       ENTRY;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
+               return rc;
 
-       EXP_MD_COUNTER_INCREMENT(exp, setattr);
-       rc = MDP(exp->exp_obd, setattr)(exp, op_data, ea, ealen, request);
-       RETURN(rc);
+       lprocfs_counter_incr(exp->exp_obd->obd_md_stats,
+                            LPROC_MD_SETATTR);
+
+       return MDP(exp->exp_obd, setattr)(exp, op_data, ea, ealen, request);
 }
 
 static inline int md_fsync(struct obd_export *exp, const struct lu_fid *fid,
@@ -1530,15 +1506,14 @@ static inline int md_fsync(struct obd_export *exp, const struct lu_fid *fid,
 {
        int rc;
 
-       ENTRY;
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
+               return rc;
 
-       EXP_MD_COUNTER_INCREMENT(exp, fsync);
-       rc = MDP(exp->exp_obd, fsync)(exp, fid, request);
+       lprocfs_counter_incr(exp->exp_obd->obd_md_stats,
+                            LPROC_MD_FSYNC);
 
-       RETURN(rc);
+       return MDP(exp->exp_obd, fsync)(exp, fid, request);
 }
 
 /* FLR: resync mirrored files. */
@@ -1547,15 +1522,11 @@ static inline int md_file_resync(struct obd_export *exp,
 {
        int rc;
 
-       ENTRY;
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-
-       EXP_MD_COUNTER_INCREMENT(exp, file_resync);
-       rc = MDP(exp->exp_obd, file_resync)(exp, data);
+               return rc;
 
-       RETURN(rc);
+       return MDP(exp->exp_obd, file_resync)(exp, data);
 }
 
 static inline int md_read_page(struct obd_export *exp,
@@ -1565,29 +1536,31 @@ static inline int md_read_page(struct obd_export *exp,
                               struct page **ppage)
 {
        int rc;
-       ENTRY;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
+               return rc;
 
-       EXP_MD_COUNTER_INCREMENT(exp, read_page);
-       rc = MDP(exp->exp_obd, read_page)(exp, op_data, cb_op, hash_offset,
-                                         ppage);
-       RETURN(rc);
+       lprocfs_counter_incr(exp->exp_obd->obd_md_stats,
+                            LPROC_MD_READ_PAGE);
+
+       return MDP(exp->exp_obd, read_page)(exp, op_data, cb_op, hash_offset,
+                                           ppage);
 }
 
 static inline int md_unlink(struct obd_export *exp, struct md_op_data *op_data,
                             struct ptlrpc_request **request)
 {
-        int rc;
-        ENTRY;
+       int rc;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
+               return rc;
 
-        EXP_MD_COUNTER_INCREMENT(exp, unlink);
-        rc = MDP(exp->exp_obd, unlink)(exp, op_data, request);
-        RETURN(rc);
+       lprocfs_counter_incr(exp->exp_obd->obd_md_stats,
+                            LPROC_MD_UNLINK);
+
+       return MDP(exp->exp_obd, unlink)(exp, op_data, request);
 }
 
 static inline int md_get_lustre_md(struct obd_export *exp,
@@ -1597,74 +1570,76 @@ static inline int md_get_lustre_md(struct obd_export *exp,
                                    struct lustre_md *md)
 {
        int rc;
-        ENTRY;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
+               return rc;
 
-        EXP_MD_COUNTER_INCREMENT(exp, get_lustre_md);
-        RETURN(MDP(exp->exp_obd, get_lustre_md)(exp, req, dt_exp, md_exp, md));
+       return MDP(exp->exp_obd, get_lustre_md)(exp, req, dt_exp, md_exp, md);
 }
 
 static inline int md_free_lustre_md(struct obd_export *exp,
                                     struct lustre_md *md)
 {
        int rc;
-        ENTRY;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-        EXP_MD_COUNTER_INCREMENT(exp, free_lustre_md);
-        RETURN(MDP(exp->exp_obd, free_lustre_md)(exp, md));
+               return rc;
+
+       return MDP(exp->exp_obd, free_lustre_md)(exp, md);
 }
 
 static inline int md_merge_attr(struct obd_export *exp,
+                               const struct lu_fid *fid,
                                const struct lmv_stripe_md *lsm,
                                struct cl_attr *attr,
                                ldlm_blocking_callback cb)
 {
        int rc;
-       ENTRY;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-       EXP_MD_COUNTER_INCREMENT(exp, merge_attr);
-       RETURN(MDP(exp->exp_obd, merge_attr)(exp, lsm, attr, cb));
+               return rc;
+
+       return MDP(exp->exp_obd, merge_attr)(exp, fid, lsm, attr, cb);
 }
 
 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)
+                             u64 obd_md_valid, const char *name,
+                             const void *value, size_t value_size,
+                             unsigned int xattr_flags, u32 suppgid,
+                             struct ptlrpc_request **req)
 {
        int rc;
-       ENTRY;
 
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-       EXP_MD_COUNTER_INCREMENT(exp, setxattr);
-       RETURN(MDP(exp->exp_obd, setxattr)(exp, fid, valid, name, input,
-                                          input_size, output_size, flags,
-                                          suppgid, request));
+               return rc;
+
+       lprocfs_counter_incr(exp->exp_obd->obd_md_stats,
+                            LPROC_MD_SETXATTR);
+
+       return MDP(exp->exp_obd, setxattr)(exp, fid, obd_md_valid, name,
+                                          value, value_size, xattr_flags,
+                                          suppgid, req);
 }
 
 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)
+                             u64 obd_md_valid, const char *name,
+                             size_t buf_size, struct ptlrpc_request **req)
 {
        int rc;
-       ENTRY;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-       EXP_MD_COUNTER_INCREMENT(exp, getxattr);
-       RETURN(MDP(exp->exp_obd, getxattr)(exp, fid, valid, name, input,
-                                          input_size, output_size, flags,
-                                          request));
+               return rc;
+
+       lprocfs_counter_incr(exp->exp_obd->obd_md_stats,
+                            LPROC_MD_GETXATTR);
+
+       return MDP(exp->exp_obd, getxattr)(exp, fid, obd_md_valid, name,
+                                          buf_size, req);
 }
 
 static inline int md_set_open_replay_data(struct obd_export *exp,
@@ -1672,24 +1647,24 @@ static inline int md_set_open_replay_data(struct obd_export *exp,
                                          struct lookup_intent *it)
 {
        int rc;
-       ENTRY;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-       EXP_MD_COUNTER_INCREMENT(exp, set_open_replay_data);
-       RETURN(MDP(exp->exp_obd, set_open_replay_data)(exp, och, it));
+               return rc;
+
+       return MDP(exp->exp_obd, set_open_replay_data)(exp, och, it);
 }
 
 static inline int md_clear_open_replay_data(struct obd_export *exp,
                                             struct obd_client_handle *och)
 {
        int rc;
-        ENTRY;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-        EXP_MD_COUNTER_INCREMENT(exp, clear_open_replay_data);
-        RETURN(MDP(exp->exp_obd, clear_open_replay_data)(exp, och));
+               return rc;
+
+       return MDP(exp->exp_obd, clear_open_replay_data)(exp, och);
 }
 
 static inline int md_set_lock_data(struct obd_export *exp,
@@ -1697,12 +1672,12 @@ static inline int md_set_lock_data(struct obd_export *exp,
                                   void *data, __u64 *bits)
 {
        int rc;
-        ENTRY;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-        EXP_MD_COUNTER_INCREMENT(exp, set_lock_data);
-        RETURN(MDP(exp->exp_obd, set_lock_data)(exp, lockh, data, bits));
+               return rc;
+
+       return MDP(exp->exp_obd, set_lock_data)(exp, lockh, data, bits);
 }
 
 static inline
@@ -1711,16 +1686,13 @@ int md_cancel_unused(struct obd_export *exp, const struct lu_fid *fid,
                     enum ldlm_cancel_flags cancel_flags, void *opaque)
 {
        int rc;
-       ENTRY;
 
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-       EXP_MD_COUNTER_INCREMENT(exp, cancel_unused);
+               return rc;
 
-       rc = MDP(exp->exp_obd, cancel_unused)(exp, fid, policy, mode,
-                                             cancel_flags, opaque);
-       RETURN(rc);
+       return MDP(exp->exp_obd, cancel_unused)(exp, fid, policy, mode,
+                                               cancel_flags, opaque);
 }
 
 static inline enum ldlm_mode md_lock_match(struct obd_export *exp, __u64 flags,
@@ -1731,52 +1703,56 @@ static inline enum ldlm_mode md_lock_match(struct obd_export *exp, __u64 flags,
                                           struct lustre_handle *lockh)
 {
        int rc;
-       ENTRY;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-       EXP_MD_COUNTER_INCREMENT(exp, lock_match);
-       RETURN(MDP(exp->exp_obd, lock_match)(exp, flags, fid, type,
-                                            policy, mode, lockh));
+               return rc;
+
+       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, __u32 ea_size,
                                  __u32 def_ea_size)
 {
        int rc;
-       ENTRY;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-       EXP_MD_COUNTER_INCREMENT(exp, init_ea_size);
-       RETURN(MDP(exp->exp_obd, init_ea_size)(exp, ea_size, def_ea_size));
+               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)
 {
        int rc;
-       ENTRY;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-       EXP_MD_COUNTER_INCREMENT(exp, intent_getattr_async);
-       rc = MDP(exp->exp_obd, intent_getattr_async)(exp, minfo);
-       RETURN(rc);
+               return rc;
+
+       lprocfs_counter_incr(exp->exp_obd->obd_md_stats,
+                            LPROC_MD_INTENT_GETATTR_ASYNC);
+
+       return MDP(exp->exp_obd, intent_getattr_async)(exp, minfo);
 }
 
 static inline int md_revalidate_lock(struct obd_export *exp,
                                      struct lookup_intent *it,
                                      struct lu_fid *fid, __u64 *bits)
 {
-        int rc;
-        ENTRY;
+       int rc;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-        EXP_MD_COUNTER_INCREMENT(exp, revalidate_lock);
-        rc = MDP(exp->exp_obd, revalidate_lock)(exp, it, fid, bits);
-        RETURN(rc);
+               return rc;
+
+       lprocfs_counter_incr(exp->exp_obd->obd_md_stats,
+                            LPROC_MD_REVALIDATE_LOCK);
+
+       return MDP(exp->exp_obd, revalidate_lock)(exp, it, fid, bits);
 }
 
 static inline int md_get_fid_from_lsm(struct obd_export *exp,
@@ -1785,15 +1761,14 @@ static inline int md_get_fid_from_lsm(struct obd_export *exp,
                                      struct lu_fid *fid)
 {
        int rc;
-       ENTRY;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-       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);
-}
+               return rc;
 
+       return MDP(exp->exp_obd, get_fid_from_lsm)(exp, lsm, name, namelen,
+                                                  fid);
+}
 
 /* Unpack an MD struct from disk to in-memory format.
  * Returns +ve size of unpacked MD (0 for free), or -ve error.
@@ -1806,33 +1781,30 @@ static inline int md_unpackmd(struct obd_export *exp,
                              const union lmv_mds_md *lmm, size_t lmm_size)
 {
        int rc;
-       ENTRY;
+
        rc = exp_check_ops(exp);
        if (rc)
-               RETURN(rc);
-       EXP_MD_COUNTER_INCREMENT(exp, unpackmd);
-       rc = MDP(exp->exp_obd, unpackmd)(exp, plsm, lmm, lmm_size);
-       RETURN(rc);
-}
+               return rc;
 
-/* OBD Metadata Support */
+       return MDP(exp->exp_obd, unpackmd)(exp, plsm, lmm, lmm_size);
+}
 
-extern int obd_init_caches(void);
-extern void obd_cleanup_caches(void);
+static inline int md_rmfid(struct obd_export *exp, struct fid_array *fa,
+                          int *rcs, struct ptlrpc_request_set *set)
+{
+       int rc;
 
-/* support routines */
-extern struct kmem_cache *obdo_cachep;
+       rc = exp_check_ops(exp);
+       if (rc)
+               return rc;
 
-#define OBDO_ALLOC(ptr)                                                       \
-do {                                                                          \
-       OBD_SLAB_ALLOC_PTR_GFP((ptr), obdo_cachep, GFP_NOFS);             \
-} while(0)
+       return MDP(exp->exp_obd, rmfid)(exp, fa, rcs, set);
+}
 
-#define OBDO_FREE(ptr)                                                        \
-do {                                                                          \
-        OBD_SLAB_FREE_PTR((ptr), obdo_cachep);                                \
-} while(0)
+/* OBD Metadata Support */
 
+extern int obd_init_caches(void);
+extern void obd_cleanup_caches(void);
 
 typedef int (*register_lwp_cb)(void *data);
 
@@ -1864,19 +1836,6 @@ int lustre_register_fs(void);
 int lustre_unregister_fs(void);
 int lustre_check_exclusion(struct super_block *sb, char *svname);
 
-/* sysctl.c */
-extern int obd_sysctl_init(void);
-extern void obd_sysctl_clean(void);
-
-typedef __u8 class_uuid_t[16];
-static inline void class_uuid_unparse(class_uuid_t uu, struct obd_uuid *out)
-{
-       snprintf(out->uuid, sizeof(out->uuid), "%02x%02x%02x%02x-%02x%02x-"
-                "%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-                uu[14], uu[15], uu[12], uu[13], uu[10], uu[11], uu[8], uu[9],
-                uu[6], uu[7], uu[4], uu[5], uu[2], uu[3], uu[0], uu[1]);
-}
-
 /* lustre_peer.c    */
 int lustre_uuid_to_peer(const char *uuid, lnet_nid_t *peer_nid, int index);
 int class_add_uuid(const char *uuid, __u64 nid);
@@ -1884,10 +1843,7 @@ int class_del_uuid (const char *uuid);
 int class_check_uuid(struct obd_uuid *uuid, __u64 nid);
 
 /* 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))
+extern char obd_jobid_name[];
 
 /* statfs_pack.c */
 struct kstatfs;
@@ -1895,12 +1851,11 @@ 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;
+       spinlock_t              rsi_lock;
 };
 
 int server_name2index(const char *svname, __u32 *idx, const char **endptr);
@@ -1911,4 +1866,14 @@ int obd_ioctl_getdata(char **buf, int *len, void __user *arg);
 int class_procfs_init(void);
 int class_procfs_clean(void);
 
+extern void obd_heat_add(struct obd_heat_instance *instance,
+                        unsigned int time_second, __u64 count,
+                        unsigned int weight, unsigned int period_second);
+extern void obd_heat_decay(struct obd_heat_instance *instance,
+                          __u64 time_second, unsigned int weight,
+                          unsigned int period_second);
+extern __u64 obd_heat_get(struct obd_heat_instance *instance,
+                         unsigned int time_second, unsigned int weight,
+                         unsigned int period_second);
+extern void obd_heat_clear(struct obd_heat_instance *instance, int count);
 #endif /* __LINUX_OBD_CLASS_H */