b=3031

[fs/lustre-release.git] / lustre / obdecho / lproc_echo.c

diff --git a/lustre/obdecho/lproc_echo.c b/lustre/obdecho/lproc_echo.c
index 4592f6b..c25d156 100644 (file)
--- a/lustre/obdecho/lproc_echo.c
+++ b/lustre/obdecho/lproc_echo.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,47 +21,23 @@
  */
 #define DEBUG_SUBSYSTEM S_ECHO
 
-#include <linux/lustre_lite.h>
 #include <linux/lprocfs_status.h>
+#include <linux/obd_class.h>
 
+#ifndef LPROCFS
+static struct lprocfs_vars lprocfs_obd_vars[]  = { {0} };
+static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
+#else
 
-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_fstype(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->u.echo.eo_fstype);
-        return len;
-
-}
-
-
-lprocfs_vars_t status_var_nm_1[]={
-        {"status/uuid", rd_uuid, 0},
-        {"status/fstype", rd_fstype, 0},
-        {0}
+static struct lprocfs_vars lprocfs_obd_vars[] = {
+        { "uuid",         lprocfs_rd_uuid,        0, 0 },
+        { 0 }
 };
 
-int rd_numdevices(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;
-}
-
-lprocfs_vars_t status_class_var[]={
-        {"status/num_devices", rd_numdevices, 0},
-        {0}
+static struct lprocfs_vars lprocfs_module_vars[] = {
+        { "num_refs",     lprocfs_rd_numrefs,     0, 0 },
+        { 0 }
 };
+
+#endif /* LPROCFS */
+LPROCFS_INIT_VARS(echo, lprocfs_module_vars, lprocfs_obd_vars)