X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fmdt%2Fmdt_fs.c;h=862d19ad202aa934cd165e642209080a4d165ec2;hb=917655fc2938b90a9c246dd2d58408c42aa1658d;hp=e26db5628de48b53572087e80654ede31aa3ca8b;hpb=2b294992edce5af7b79d4300ed3aa1ea6a8db850;p=fs%2Flustre-release.git

diff --git a/lustre/mdt/mdt_fs.c b/lustre/mdt/mdt_fs.c
index e26db56..862d19a 100644
--- a/lustre/mdt/mdt_fs.c
+++ b/lustre/mdt/mdt_fs.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2008, 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/
@@ -50,49 +46,57 @@ static const struct file_operations mdt_open_files_seq_fops = {
 	.release = seq_release,
 };
 
-int mdt_export_stats_init(struct obd_device *obd,
-                          struct obd_export *exp,
-                          void              *localdata)
+/**
+ * Initialize MDT per-export statistics.
+ *
+ * This function sets up procfs entries for various MDT export counters. These
+ * counters are for per-client statistics tracked on the server.
+ *
+ * \param[in] obd	OBD device
+ * \param[in] exp	OBD export
+ * \param[in] localdata	NID of client
+ *
+ * \retval		0 if successful
+ * \retval		negative value on error
+ */
+int mdt_export_stats_init(struct obd_device *obd, struct obd_export *exp,
+			  void *localdata)
 {
-        lnet_nid_t *client_nid = localdata;
-        int        rc, newnid;
-        ENTRY;
+	lnet_nid_t *client_nid = localdata;
+	struct nid_stat *stats;
+	int rc;
+	ENTRY;
 
-	LASSERT(!obd->obd_uses_nid_stats);
+	rc = lprocfs_exp_setup(exp, client_nid);
+	if (rc != 0)
+		/* Mask error for already created /proc entries */
+		RETURN(rc == -EALREADY ? 0 : rc);
 
-        rc = lprocfs_exp_setup(exp, client_nid, &newnid);
-        if (rc) {
-                /* Mask error for already created
-                 * /proc entries */
-                if (rc == -EALREADY)
-                        rc = 0;
-                RETURN(rc);
-        }
-        if (newnid) {
-                struct nid_stat *tmp = exp->exp_nid_stats;
-
-		tmp->nid_stats = lprocfs_alloc_stats(LPROC_MDT_LAST,
+	stats = exp->exp_nid_stats;
+	stats->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);
-                if (rc)
-                        GOTO(clean, rc);
-                rc = lprocfs_nid_ldlm_stats_init(tmp);
-                if (rc)
-                        GOTO(clean, rc);
+	if (stats->nid_stats == NULL)
+		RETURN(-ENOMEM);
+
+	mdt_stats_counter_init(stats->nid_stats);
+
+	rc = lprocfs_register_stats(stats->nid_proc, "stats", stats->nid_stats);
+	if (rc != 0) {
+		lprocfs_free_stats(&stats->nid_stats);
+		GOTO(out, rc);
+	}
+
+	rc = lprocfs_nid_ldlm_stats_init(stats);
+	if (rc != 0)
+		GOTO(out, rc);
 
-		rc = lprocfs_seq_create(tmp->nid_proc, "open_files",
-					0444, &mdt_open_files_seq_fops, tmp);
-		if (rc) {
-			CWARN("%s: error adding the open_files file: rc = %d\n",
-			      obd->obd_name, rc);
-			GOTO(clean, rc);
-		}
+	rc = lprocfs_seq_create(stats->nid_proc, "open_files",
+				0444, &mdt_open_files_seq_fops, stats);
+	if (rc != 0) {
+		CWARN("%s: error adding the open_files file: rc = %d\n",
+			obd->obd_name, rc);
+		GOTO(out, rc);
 	}
-        RETURN(0);
- clean:
-        return rc;
+out:
+	RETURN(rc);
 }