X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_lproc.c;h=4d8e42dd18c47fa3fb30786d623cbf4be520d4c2;hb=c961228f1c30254c454ed1432ba83af3aa7c39b4;hp=47560b88e5f850ebbd790b8f2eeacf1917b41947;hpb=9ddf386035767a96b54e21559f3ea0be126dc8cd;p=fs%2Flustre-release.git

diff --git a/lustre/mdd/mdd_lproc.c b/lustre/mdd/mdd_lproc.c
index 47560b8..4d8e42d 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,23 +46,19 @@
 #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;
-        struct lu_device    *ld = &mdd->mdd_md_dev.md_lu_dev;
         struct obd_type     *type;
         int                  rc;
         ENTRY;
 
-        type = ld->ld_type->ldt_obd_type;
+	/* at the moment there is no linkage between lu_type
+	 * and obd_type, so we lookup obd_type this way */
+	type = class_search_type(LUSTRE_MDD_NAME);
 
         LASSERT(name != NULL);
         LASSERT(type != NULL);
@@ -77,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:
@@ -90,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;
@@ -100,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)
 {
@@ -216,21 +198,30 @@ static int lprocfs_changelog_users_cb(const struct lu_env *env,
 static int lprocfs_rd_changelog_users(char *page, char **start, off_t off,
                                       int count, int *eof, void *data)
 {
-        struct mdd_device *mdd = data;
-        struct llog_ctxt *ctxt;
-        struct cucb_data cucb;
-        __u64 cur;
+	struct lu_env		 env;
+	struct mdd_device	*mdd = data;
+	struct llog_ctxt	*ctxt;
+	struct cucb_data	 cucb;
+	__u64			 cur;
+	int			 rc;
 
         *eof = 1;
 
-        ctxt = llog_get_context(mdd2obd_dev(mdd),LLOG_CHANGELOG_USER_ORIG_CTXT);
+        ctxt = llog_get_context(mdd2obd_dev(mdd),
+				LLOG_CHANGELOG_USER_ORIG_CTXT);
         if (ctxt == NULL)
                 return -ENXIO;
         LASSERT(ctxt->loc_handle->lgh_hdr->llh_flags & LLOG_F_IS_CAT);
 
-        cfs_spin_lock(&mdd->mdd_cl.mc_lock);
-        cur = mdd->mdd_cl.mc_index;
-        cfs_spin_unlock(&mdd->mdd_cl.mc_lock);
+	rc = lu_env_init(&env, LCT_LOCAL);
+	if (rc) {
+		llog_ctxt_put(ctxt);
+		return rc;
+	}
+
+	spin_lock(&mdd->mdd_cl.mc_lock);
+	cur = mdd->mdd_cl.mc_index;
+	spin_unlock(&mdd->mdd_cl.mc_lock);
 
         cucb.count = count;
         cucb.page = page;
@@ -242,11 +233,12 @@ static int lprocfs_rd_changelog_users(char *page, char **start, off_t off,
         cucb.idx += snprintf(cucb.page + cucb.idx, cucb.count - cucb.idx,
                               "%-5s %s\n", "ID", "index");
 
-	llog_cat_process(NULL, ctxt->loc_handle, lprocfs_changelog_users_cb,
+	llog_cat_process(&env, ctxt->loc_handle, lprocfs_changelog_users_cb,
 			 &cucb, 0, 0);
 
-        llog_ctxt_put(ctxt);
-        return cucb.idx;
+	lu_env_fini(&env);
+	llog_ctxt_put(ctxt);
+	return cucb.idx;
 }
 
 static int lprocfs_rd_sync_perm(char *page, char **start, off_t off,
@@ -280,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,
@@ -293,13 +286,21 @@ 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 struct lprocfs_vars lprocfs_mdd_obd_vars[] = {