Merge b_md into HEAD

[fs/lustre-release.git] / lustre / osc / lproc_osc.c

diff --git a/lustre/osc/lproc_osc.c b/lustre/osc/lproc_osc.c
index 58e9097..69af4bc 100644 (file)
--- a/lustre/osc/lproc_osc.c
+++ b/lustre/osc/lproc_osc.c
@@ -1,7 +1,7 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- *  Copyright (C) 2002 Cluster File Systems, Inc.
+ *  Copyright (C) 2002, 2003 Cluster File Systems, Inc.
  *
  *   This file is part of Lustre, http://www.lustre.org.
  *
@@ -21,99 +21,38 @@
  */
 #define DEBUG_SUBSYSTEM S_CLASS
 
-#include <linux/lustre_lite.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)
-{
-        int len = 0;
-        struct obd_device* dev = (struct obd_device*)data;
-        len += snprintf(page, count, "%s\n", dev->obd_uuid);
-        return len;
-
-}
-int rd_blksize(char* page, char **start, off_t off, int count, int *eof, 
-               void *data)
-{
-        return 0;
-}
-int rd_kbytestotal(char* page, char **start, off_t off, int count, int *eof, 
-                   void *data)
-{
-        return 0;
-}
-
-int rd_kbytesfree(char* page, char **start, off_t off, int count, int *eof, 
-                  void *data)
-{
-        return 0;
-}
-
-int rd_filestotal(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_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_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;  
-        
-}
-
-struct lprocfs_vars status_var_nm_1[] = {
-        {"status/uuid", rd_uuid, 0, 0},
-        {"status/blocksize",rd_blksize, 0, 0},
-        {"status/kbytestotal", rd_kbytestotal, 0, 0},
-        {"status/kbytesfree", rd_kbytesfree, 0, 0},
-        {"status/filestotal", rd_filestotal, 0, 0},
-        {"status/filesfree", rd_filesfree, 0, 0},
-        {"status/filegroups", rd_filegroups, 0, 0},
-        {"status/ost_server_uuid", rd_server_uuid, 0, 0},
-        {"status/ost_conn_uuid", rd_conn_uuid, 0, 0},
-        {0}
+#ifndef LPROCFS
+struct lprocfs_vars lprocfs_obd_vars[]  = { {0} };
+struct lprocfs_vars lprocfs_module_vars[] = { {0} };
+#else
+
+DEFINE_LPROCFS_STATFS_FCT(rd_blksize,     obd_self_statfs);
+DEFINE_LPROCFS_STATFS_FCT(rd_kbytestotal, obd_self_statfs);
+DEFINE_LPROCFS_STATFS_FCT(rd_kbytesfree,  obd_self_statfs);
+DEFINE_LPROCFS_STATFS_FCT(rd_filestotal,  obd_self_statfs);
+DEFINE_LPROCFS_STATFS_FCT(rd_filesfree,   obd_self_statfs);
+DEFINE_LPROCFS_STATFS_FCT(rd_filegroups,  obd_self_statfs);
+
+struct lprocfs_vars lprocfs_obd_vars[] = {
+        { "uuid",            lprocfs_rd_uuid, 0, 0 },
+        { "blocksize",       rd_blksize, 0, 0 },
+        { "kbytestotal",     rd_kbytestotal, 0, 0 },
+        { "kbytesfree",      rd_kbytesfree, 0, 0 },
+        { "filestotal",      rd_filestotal, 0, 0 },
+        { "filesfree",       rd_filesfree, 0, 0   },
+        { "filegroups",      rd_filegroups, 0, 0 },
+        { "ost_server_uuid", lprocfs_rd_server_uuid, 0, 0 },
+        { "ost_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}
+struct lprocfs_vars lprocfs_module_vars[] = {
+        { "num_refs",        lprocfs_rd_numrefs, 0, 0 },
+        { 0 }
 };
+
+#endif /* LPROCFS */
+LPROCFS_INIT_VARS(lprocfs_module_vars, lprocfs_obd_vars)