X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_lproc.c;h=4d64e43afd758022899c4f3bed1bf0942b53f873;hb=cd4b609713b678cc464efa5ce2cabb01b41c9a30;hp=91d8a84ed39f8311af214a19925897fbbd99546b;hpb=9fb46705ae86aa2c0ac29427f0ff24f923560eb7;p=fs%2Flustre-release.git

diff --git a/lustre/mdd/mdd_lproc.c b/lustre/mdd/mdd_lproc.c
index 91d8a84..4d64e43 100644
--- a/lustre/mdd/mdd_lproc.c
+++ b/lustre/mdd/mdd_lproc.c
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -44,14 +46,9 @@
 #include <obd_class.h>
 #include <obd_support.h>
 #include <lprocfs_status.h>
-#include <lu_time.h>
 #include <libcfs/libcfs_string.h>
-
 #include "mdd_internal.h"
 
-static const char *mdd_counter_names[LPROC_MDD_NR] = {
-};
-
 int mdd_procfs_init(struct mdd_device *mdd, const char *name)
 {
         struct lprocfs_static_vars lvars;
@@ -78,9 +75,7 @@ int mdd_procfs_init(struct mdd_device *mdd, const char *name)
                 GOTO(out, rc);
         }
 
-        rc = lu_time_init(&mdd->mdd_stats,
-                          mdd->mdd_proc_entry,
-                          mdd_counter_names, ARRAY_SIZE(mdd_counter_names));
+	rc = 0;
 
         EXIT;
 out:
@@ -91,9 +86,6 @@ out:
 
 int mdd_procfs_fini(struct mdd_device *mdd)
 {
-        if (mdd->mdd_stats)
-                lu_time_fini(&mdd->mdd_stats);
-
         if (mdd->mdd_proc_entry) {
                  lprocfs_remove(&mdd->mdd_proc_entry);
                  mdd->mdd_proc_entry = NULL;
@@ -101,17 +93,6 @@ int mdd_procfs_fini(struct mdd_device *mdd)
         RETURN(0);
 }
 
-void mdd_lprocfs_time_start(const struct lu_env *env)
-{
-        lu_lprocfs_time_start(env);
-}
-
-void mdd_lprocfs_time_end(const struct lu_env *env, struct mdd_device *mdd,
-                          int idx)
-{
-        lu_lprocfs_time_end(env, mdd->mdd_stats, idx);
-}
-
 static int lprocfs_wr_atime_diff(struct file *file, const char *buffer,
                                  unsigned long count, void *data)
 {
@@ -291,7 +272,8 @@ static int lprocfs_rd_lfsck_speed_limit(char *page, char **start, off_t off,
 
 	LASSERT(mdd != NULL);
 	*eof = 1;
-	return snprintf(page, count, "%u\n", mdd->mdd_lfsck.ml_speed_limit);
+	return snprintf(page, count, "%u\n",
+			mdd->mdd_lfsck.ml_bookmark_ram.lb_speed_limit);
 }
 
 static int lprocfs_wr_lfsck_speed_limit(struct file *file, const char *buffer,
@@ -304,13 +286,40 @@ static int lprocfs_wr_lfsck_speed_limit(struct file *file, const char *buffer,
 
 	LASSERT(mdd != NULL);
 	rc = lprocfs_write_helper(buffer, count, &val);
-	if (rc)
+	if (rc != 0)
 		return rc;
 
 	lfsck = &mdd->mdd_lfsck;
-	if (val != lfsck->ml_speed_limit)
-		mdd_lfsck_set_speed(lfsck, val);
-	return count;
+	if (val != lfsck->ml_bookmark_ram.lb_speed_limit) {
+		struct lu_env env;
+
+		rc = lu_env_init(&env, LCT_MD_THREAD | LCT_DT_THREAD);
+		if (rc != 0)
+			return rc;
+
+		rc = mdd_lfsck_set_speed(&env, lfsck, val);
+		lu_env_fini(&env);
+	}
+	return rc != 0 ? rc : count;
+}
+
+static int lprocfs_rd_lfsck_namespace(char *page, char **start, off_t off,
+				      int count, int *eof, void *data)
+{
+	struct lu_env env;
+	struct mdd_device *mdd = data;
+	int rc;
+
+	LASSERT(mdd != NULL);
+	*eof = 1;
+
+	rc = lu_env_init(&env, LCT_MD_THREAD | LCT_DT_THREAD);
+	if (rc != 0)
+		return rc;
+
+	rc = mdd_lfsck_dump(&env, &mdd->mdd_lfsck, LT_NAMESPACE, page, count);
+	lu_env_fini(&env);
+	return rc;
 }
 
 static struct lprocfs_vars lprocfs_mdd_obd_vars[] = {
@@ -321,6 +330,7 @@ static struct lprocfs_vars lprocfs_mdd_obd_vars[] = {
         { "sync_permission", lprocfs_rd_sync_perm, lprocfs_wr_sync_perm, 0 },
 	{ "lfsck_speed_limit", lprocfs_rd_lfsck_speed_limit,
 			       lprocfs_wr_lfsck_speed_limit, 0 },
+	{ "lfsck_namespace", lprocfs_rd_lfsck_namespace, 0, 0 },
 	{ 0 }
 };