X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_fs.c;h=17706206b8ebb5b22b3a7b212a8428ec7b3d0a23;hb=cc2f3bb6f2bf7a77a3176f240e00f38245d12242;hp=7c6a489e7fdaca718bcc30469b51b5f922f10f44;hpb=7dcefb8de5aa4299f8c9c2d60ce27a6d2fac2db7;p=fs%2Flustre-release.git

diff --git a/lustre/mdt/mdt_fs.c b/lustre/mdt/mdt_fs.c
index 7c6a489..1770620 100644
--- a/lustre/mdt/mdt_fs.c
+++ b/lustre/mdt/mdt_fs.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -46,34 +46,27 @@
 
 int mdt_export_stats_init(struct obd_device *obd,
                           struct obd_export *exp,
+                          int               reconnect,
                           void              *localdata)
 {
         lnet_nid_t *client_nid = localdata;
         int        rc, newnid;
+        ENTRY;
 
-        rc = lprocfs_exp_setup(exp, client_nid, &newnid);
+        rc = lprocfs_exp_setup(exp, client_nid, reconnect, &newnid);
         if (rc) {
                 /* Mask error for already created
                  * /proc entries */
                 if (rc == -EALREADY)
                         rc = 0;
-                return rc;
+                RETURN(rc);
         }
-
-        if ((obd->md_stats == NULL) &&
-            (rc = lprocfs_alloc_md_stats(obd, LPROC_MDT_NR)))
-                return rc;
         if (newnid) {
-                /* Always add in ldlm_stats */
-                exp->exp_nid_stats->nid_ldlm_stats =
-                        lprocfs_alloc_stats(LDLM_LAST_OPC - LDLM_FIRST_OPC,
-                                            LPROCFS_STATS_FLAG_NOPERCPU);
-                if (exp->exp_nid_stats->nid_ldlm_stats == NULL)
-                        return -ENOMEM;
-                lprocfs_init_ldlm_stats(exp->exp_nid_stats->nid_ldlm_stats);
-                rc = lprocfs_register_stats(exp->exp_nid_stats->nid_proc,
-                                            "ldlm_stats",
-                                            exp->exp_nid_stats->nid_ldlm_stats);
+                rc = lprocfs_nid_ldlm_stats_init(exp->exp_nid_stats);
+                if (rc)
+                        GOTO(clean, rc);
         }
+        RETURN(0);
+ clean:
         return rc;
 }