X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdc%2Flproc_mdc.c;h=7223b814ec218aae6e612247e9bdf4fbe1b2d957;hb=11e0902cb38306ccb570ae2aab6348f64bdb9825;hp=357c1de5e4136031f81bb3e212ebc5d49c5e6987;hpb=404d2dc2fc01f49ae469a3e7c81bac431bd84936;p=fs%2Flustre-release.git

diff --git a/lustre/mdc/lproc_mdc.c b/lustre/mdc/lproc_mdc.c
index 357c1de..7223b81 100644
--- a/lustre/mdc/lproc_mdc.c
+++ b/lustre/mdc/lproc_mdc.c
@@ -21,108 +21,34 @@
  */
 #define DEBUG_SUBSYSTEM S_CLASS
 
-#include <linux/lustre_lite.h>
+#include <linux/version.h>
+#include <linux/vfs.h>
+#include <linux/obd_class.h>
 #include <linux/lprocfs_status.h>
 
-
-int rd_uuid(char* page, char **start, off_t off, int count, int *eof, 
-            void *data)
-{
-
-       struct obd_device* temp = (struct obd_device*)data;
-       int len = 0;
-       len += snprintf(page, count, "%s\n",temp->obd_uuid);   
-       return len;
-
-
-}
-int rd_blksize(char* page, char **start, off_t off, int count, int *eof, 
-               void *data)
-{
-        return 0;
-}
-int rd_kbtotal(char* page, char **start, off_t off, int count, int *eof, 
-               void *data)
-{
-        return 0;
-}
-
-int rd_kbfree(char* page, char **start, off_t off, int count, int *eof, 
-              void *data)
-{
-        return 0;
-}
-
-
-int rd_files(char* page, char **start, off_t off, int count, int *eof, 
-             void *data)
-{
-        return 0;
-}
-
-int rd_filesfree(char* page, char **start, off_t off, int count, int *eof, 
-                 void *data)
-{
-        return 0;
-}
-
-int rd_filegroups(char* page, char **start, off_t off, int count, int *eof, 
-                  void *data)
-{
-        return 0;
-}
-int rd_conn_uuid(char* page, char **start, off_t off, int count, int *eof, 
-                 void *data)
-{
-        struct obd_device* temp = (struct obd_device*)data;
-        struct client_obd* cli = &temp->u.cli;
-        struct obd_import* imp = &cli->cl_import;
-        int len = 0;
-        
-        len += snprintf(page, count, "%s\n",imp->imp_connection->c_remote_uuid);   
-        return len;
-}
-
-int rd_server_uuid(char* page, char **start, off_t off, int count, int *eof, 
-                   void *data)
-{
-        struct obd_device* temp = (struct obd_device*)data;
-        struct client_obd* cli = &temp->u.cli;
-        int len = 0;
-        
-        len += snprintf(page, count, "%s\n",cli->cl_target_uuid);   
-        return len;
-}
-
-int rd_server_name(char* page, char **start, off_t off, int count, int *eof, 
-                   void *data)
-{
-        return 0;
-        
-}
-
-struct lprocfs_vars status_var_nm_1[] = {
-        {"status/uuid", rd_uuid, 0, 0},
-        {"status/blocksize",rd_blksize, 0, 0},
-        {"status/kbytestotal",rd_kbtotal, 0, 0},
-        {"status/kbytesfree", rd_kbfree, 0, 0},
-        {"status/files", rd_files, 0, 0},
-        {"status/filesfree", rd_filesfree, 0, 0},
-        {"status/filegroups", rd_filegroups, 0, 0},
-        {"status/mds_server_uuid", rd_server_uuid, 0, 0},
-        {"status/mds_conn_uuid", rd_conn_uuid, 0, 0},
-        {0}
+#ifndef LPROCFS
+static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
+static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
+#else
+static struct lprocfs_vars lprocfs_obd_vars[] = {
+        { "uuid",            lprocfs_rd_uuid,        0, 0 },
+        { "blocksize",       lprocfs_rd_blksize,     0, 0 },
+        { "kbytestotal",     lprocfs_rd_kbytestotal, 0, 0 },
+        { "kbytesfree",      lprocfs_rd_kbytesfree,  0, 0 },
+        { "kbytesavail",     lprocfs_rd_kbytesavail, 0, 0 },
+        { "filestotal",      lprocfs_rd_filestotal,  0, 0 },
+        { "filesfree",       lprocfs_rd_filesfree,   0, 0 },
+        //{ "filegroups",      lprocfs_rd_filegroups,  0, 0 },
+        { "mds_server_uuid", lprocfs_rd_server_uuid, 0, 0 },
+        { "mds_conn_uuid",   lprocfs_rd_conn_uuid,   0, 0 },
+        { 0 }
 };
-int rd_numrefs(char* page, char **start, off_t off, int count, int *eof, 
-               void *data)
-{
-        struct obd_type* class = (struct obd_type*)data;
-        int len = 0;
-        len += snprintf(page, count, "%d\n", class->typ_refcnt);
-        return len;
-}
 
-struct lprocfs_vars status_class_var[] = {
-        {"status/num_refs", rd_numrefs, 0, 0},
-        {0}
+static struct lprocfs_vars lprocfs_module_vars[] = {
+        { "num_refs",        lprocfs_rd_numrefs,     0, 0 },
+        { 0 }
 };
+
+#endif /* LPROCFS */
+
+LPROCFS_INIT_VARS(mdc, lprocfs_module_vars, lprocfs_obd_vars)