LU-2101 clio: cl_sync_io_wait() need a barrier

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

diff --git a/lustre/mdt/mdt_lproc.c b/lustre/mdt/mdt_lproc.c
index 26d4692..1560ec1 100644 (file)
--- a/lustre/mdt/mdt_lproc.c
+++ b/lustre/mdt/mdt_lproc.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -61,16 +61,9 @@
 #include <lustre_mds.h>
 #include <lustre_mdt.h>
 #include <lprocfs_status.h>
-#include <lu_time.h>
 #include "mdt_internal.h"
 #include <lnet/lib-lnet.h>
 
-enum {
-        LPROC_MDT_NR
-};
-static const char *mdt_proc_names[LPROC_MDT_NR] = {
-};
-
 /**
  * The rename stats output would be YAML formats, like
  * rename_stats:
@@ -169,15 +162,15 @@ LPROC_SEQ_FOPS(mdt_rename_stats);
 
 static int lproc_mdt_attach_rename_seqstat(struct mdt_device *mdt)
 {
-        struct lu_device *ld = &mdt->mdt_md_dev.md_lu_dev;
-        struct obd_device *obd = ld->ld_obd;
-        int i;
+       struct lu_device *ld = &mdt->mdt_md_dev.md_lu_dev;
+       struct obd_device *obd = ld->ld_obd;
+       int i;
 
-        for (i = 0; i < RENAME_LAST; i++)
-                spin_lock_init(&mdt->mdt_rename_stats.hist[i].oh_lock);
+       for (i = 0; i < RENAME_LAST; i++)
+               spin_lock_init(&mdt->mdt_rename_stats.hist[i].oh_lock);
 
-        return lprocfs_obd_seq_create(obd, "rename_stats", 0444,
-                                      &mdt_rename_stats_fops, mdt);
+       return lprocfs_obd_seq_create(obd, "rename_stats", 0644,
+                                     &mdt_rename_stats_fops, mdt);
 }
 
 void mdt_rename_counter_tally(struct mdt_thread_info *info,
@@ -243,19 +236,6 @@ int mdt_procfs_init(struct mdt_device *mdt, const char *name)
         }
         ptlrpc_lprocfs_register_obd(obd);
 
-        mdt->mdt_proc_entry = obd->obd_proc_entry;
-        LASSERT(mdt->mdt_proc_entry != NULL);
-
-        rc = lu_time_init(&mdt->mdt_stats, mdt->mdt_proc_entry,
-                          mdt_proc_names, ARRAY_SIZE(mdt_proc_names));
-        if (rc == 0)
-                rc = lu_time_named_init(&ld->ld_site->ls_time_stats,
-                                        "site_time", mdt->mdt_proc_entry,
-                                         lu_time_names,
-                                         ARRAY_SIZE(lu_time_names));
-        if (rc)
-                return rc;
-
         obd->obd_proc_exports_entry = proc_mkdir("exports",
                                                  obd->obd_proc_entry);
         if (obd->obd_proc_exports_entry)
@@ -292,27 +272,12 @@ int mdt_procfs_fini(struct mdt_device *mdt)
         lprocfs_free_per_client_stats(obd);
         lprocfs_obd_cleanup(obd);
         ptlrpc_lprocfs_unregister_obd(obd);
-        if (mdt->mdt_proc_entry) {
-                lu_time_fini(&ld->ld_site->ls_time_stats);
-                lu_time_fini(&mdt->mdt_stats);
-                mdt->mdt_proc_entry = NULL;
-        }
         lprocfs_free_md_stats(obd);
         lprocfs_free_obd_stats(obd);
 
         RETURN(0);
 }
 
-void mdt_time_start(const struct mdt_thread_info *info)
-{
-        lu_lprocfs_time_start(info->mti_env);
-}
-
-void mdt_time_end(const struct mdt_thread_info *info, int idx)
-{
-        lu_lprocfs_time_end(info->mti_env, info->mti_mdt->mdt_stats, idx);
-}
-
 static int lprocfs_rd_identity_expire(char *page, char **start, off_t off,
                                       int count, int *eof, void *data)
 {
@@ -376,11 +341,11 @@ static int lprocfs_rd_identity_upcall(char *page, char **start, off_t off,
         struct upcall_cache *hash = mdt->mdt_identity_cache;
         int len;
 
-        *eof = 1;
-        cfs_read_lock(&hash->uc_upcall_rwlock);
-        len = snprintf(page, count, "%s\n", hash->uc_upcall);
-        cfs_read_unlock(&hash->uc_upcall_rwlock);
-        return len;
+       *eof = 1;
+       read_lock(&hash->uc_upcall_rwlock);
+       len = snprintf(page, count, "%s\n", hash->uc_upcall);
+       read_unlock(&hash->uc_upcall_rwlock);
+       return len;
 }
 
 static int lprocfs_wr_identity_upcall(struct file *file, const char *buffer,
@@ -403,9 +368,9 @@ static int lprocfs_wr_identity_upcall(struct file *file, const char *buffer,
                 GOTO(failed, rc = -EFAULT);
 
         /* Remove any extraneous bits from the upcall (e.g. linefeeds) */
-        cfs_write_lock(&hash->uc_upcall_rwlock);
-        sscanf(kernbuf, "%s", hash->uc_upcall);
-        cfs_write_unlock(&hash->uc_upcall_rwlock);
+       write_lock(&hash->uc_upcall_rwlock);
+       sscanf(kernbuf, "%s", hash->uc_upcall);
+       write_unlock(&hash->uc_upcall_rwlock);
 
         if (strcmp(hash->uc_name, obd->obd_name) != 0)
                 CWARN("%s: write to upcall name %s\n",
@@ -832,7 +797,7 @@ static int lprocfs_wr_nosquash_nids(struct file *file, const char *buffer,
 
         if (!strcmp(kernbuf, "NONE") || !strcmp(kernbuf, "clear")) {
                 /* empty string is special case */
-                cfs_down_write(&mdt->mdt_squash_sem);
+               down_write(&mdt->mdt_squash_sem);
                 if (!cfs_list_empty(&mdt->mdt_nosquash_nids)) {
                         cfs_free_nidlist(&mdt->mdt_nosquash_nids);
                         OBD_FREE(mdt->mdt_nosquash_str,
@@ -840,7 +805,7 @@ static int lprocfs_wr_nosquash_nids(struct file *file, const char *buffer,
                         mdt->mdt_nosquash_str = NULL;
                         mdt->mdt_nosquash_strlen = 0;
                 }
-                cfs_up_write(&mdt->mdt_squash_sem);
+               up_write(&mdt->mdt_squash_sem);
                 LCONSOLE_INFO("%s: nosquash_nids is cleared\n",
                               obd->obd_name);
                 OBD_FREE(kernbuf, count + 1);
@@ -853,7 +818,7 @@ static int lprocfs_wr_nosquash_nids(struct file *file, const char *buffer,
                 GOTO(failed, rc = -EINVAL);
         }
 
-        cfs_down_write(&mdt->mdt_squash_sem);
+       down_write(&mdt->mdt_squash_sem);
         if (!cfs_list_empty(&mdt->mdt_nosquash_nids)) {
                 cfs_free_nidlist(&mdt->mdt_nosquash_nids);
                 OBD_FREE(mdt->mdt_nosquash_str, mdt->mdt_nosquash_strlen);
@@ -864,7 +829,7 @@ static int lprocfs_wr_nosquash_nids(struct file *file, const char *buffer,
 
         LCONSOLE_INFO("%s: nosquash_nids is set to %s\n",
                       obd->obd_name, kernbuf);
-        cfs_up_write(&mdt->mdt_squash_sem);
+       up_write(&mdt->mdt_squash_sem);
         RETURN(count);
 
  failed:
@@ -1030,10 +995,20 @@ static struct lprocfs_vars lprocfs_mdt_module_vars[] = {
 
 void lprocfs_mdt_init_vars(struct lprocfs_static_vars *lvars)
 {
-    lvars->module_vars  = lprocfs_mdt_module_vars;
-    lvars->obd_vars     = lprocfs_mdt_obd_vars;
+       lvars->module_vars  = lprocfs_mdt_module_vars;
+       lvars->obd_vars     = lprocfs_mdt_obd_vars;
 }
 
+struct lprocfs_vars lprocfs_mds_obd_vars[] = {
+       { "uuid",        lprocfs_rd_uuid,       0, 0 },
+       { 0 }
+};
+
+struct lprocfs_vars lprocfs_mds_module_vars[] = {
+       { "num_refs",     lprocfs_rd_numrefs,     0, 0 },
+       { 0 }
+};
+
 void mdt_counter_incr(struct ptlrpc_request *req, int opcode)
 {
        struct obd_export *exp = req->rq_export;