- landing of b_fid after merge with b_hd_cleanup_merge.

[fs/lustre-release.git] / lustre / mdc / lproc_mdc.c

diff --git a/lustre/mdc/lproc_mdc.c b/lustre/mdc/lproc_mdc.c
index 1497b9e..7223b81 100644 (file)
--- a/lustre/mdc/lproc_mdc.c
+++ b/lustre/mdc/lproc_mdc.c
@@ -20,102 +20,35 @@
  *
  */
 #define DEBUG_SUBSYSTEM S_CLASS
-#include <linux/obd_support.h>
-#include <linux/obd_class.h>
-#include <linux/lprocfs.h>
-#include <linux/string.h>
-#include <linux/lustre_lib.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_blktotal(char* page, char **start, off_t off,
-                int count, int *eof, void *data)
-{
-        return 0;
-}
-
-int rd_blkfree(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_numobjects(char* page, char **start, off_t off,
-                  int count, int *eof, void *data)
-{
-        return 0;
-}
-
-int rd_objfree(char* page, char **start, off_t off,
-               int count, int *eof, void *data)
-{
-        return 0;
-}
-
-int rd_objgroups(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;
-}
+#include <linux/version.h>
+#include <linux/vfs.h>
+#include <linux/obd_class.h>
+#include <linux/lprocfs_status.h>
+
+#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_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;
-}
+static struct lprocfs_vars lprocfs_module_vars[] = {
+        { "num_refs",        lprocfs_rd_numrefs,     0, 0 },
+        { 0 }
+};
 
-int rd_server_name(char* page, char **start, off_t off,
-                 int count, int *eof, void *data)
-{
-        return 0;
-        
-}
+#endif /* LPROCFS */
 
-lprocfs_vars_t snmp_var_nm_1[]={
-        {"snmp/uuid", rd_uuid, 0},
-        {"snmp/f_blocksize",rd_blksize, 0},
-        {"snmp/f_blockstotal",rd_blktotal, 0},
-        {"snmp/f_blocksfree",rd_blkfree, 0},
-        {"snmp/f_kbytesfree", rd_kbfree, 0},
-        {"snmp/f_objects", rd_numobjects, 0},
-        {"snmp/f_objectsfree", rd_objfree, 0},
-        {"snmp/f_objectgroups", rd_objgroups, 0},
-        {"snmp/server_uuid", rd_server_uuid, 0},
-        {"snmp/conn_uuid", rd_conn_uuid, 0},
-        {0}
-};
+LPROCFS_INIT_VARS(mdc, lprocfs_module_vars, lprocfs_obd_vars)