LU-2484 obd: add md_stats to MDC and LMV devices

[fs/lustre-release.git] / lustre / mdt / mdt_fs.c

diff --git a/lustre/mdt/mdt_fs.c b/lustre/mdt/mdt_fs.c
index acdd86f..c3b43b3 100644 (file)
--- a/lustre/mdt/mdt_fs.c
+++ b/lustre/mdt/mdt_fs.c
@@ -50,6 +50,8 @@ int mdt_export_stats_init(struct obd_device *obd,
         int        rc, newnid;
         ENTRY;
 
+       LASSERT(!obd->obd_uses_nid_stats);
+
         rc = lprocfs_exp_setup(exp, client_nid, &newnid);
         if (rc) {
                 /* Mask error for already created
@@ -60,15 +62,11 @@ int mdt_export_stats_init(struct obd_device *obd,
         }
         if (newnid) {
                 struct nid_stat *tmp = exp->exp_nid_stats;
-                int num_stats;
 
-                num_stats = (sizeof(*obd->obd_type->typ_md_ops) / sizeof(void *)) +
-                            LPROC_MDT_LAST;
-                tmp->nid_stats = lprocfs_alloc_stats(num_stats,
-                                                     LPROCFS_STATS_FLAG_NOPERCPU);
-                if (tmp->nid_stats == NULL)
-                        return -ENOMEM;
-                lprocfs_init_mps_stats(LPROC_MDT_LAST, tmp->nid_stats);
+               tmp->nid_stats = lprocfs_alloc_stats(LPROC_MDT_LAST,
+                                               LPROCFS_STATS_FLAG_NOPERCPU);
+               if (tmp->nid_stats == NULL)
+                       return -ENOMEM;
                 mdt_stats_counter_init(tmp->nid_stats);
                 rc = lprocfs_register_stats(tmp->nid_proc, "stats",
                                             tmp->nid_stats);