Disable lprocfs until it can clean up.

diff --git a/lustre/include/linux/lprocfs.h b/lustre/include/linux/lprocfs.h
index d2aad17..34a9b15 100644 (file)
--- a/lustre/include/linux/lprocfs.h
+++ b/lustre/include/linux/lprocfs.h
@@ -15,9 +15,11 @@
 #ifndef _LPROCFS_H
 #define _LPROCFS_H
 
+/*
 #ifndef LPROCFS_EXISTS
 #define LPROCFS_EXISTS
 #endif
+*/
 
 #define LPROCFS_SUCCESS 1
 #define LPROCFS_FAILURE -1

diff --git a/lustre/include/linux/lprocfs_status.h b/lustre/include/linux/lprocfs_status.h
index f1fead6..64c7b92 100644 (file)
--- a/lustre/include/linux/lprocfs_status.h
+++ b/lustre/include/linux/lprocfs_status.h
@@ -23,9 +23,11 @@
 #ifndef _LPROCFS_SNMP_H
 #define _LPROCFS_SNMP_H
 
+/*
 #ifndef LPROC_SNMP
 #define LPROC_SNMP
 #endif
+*/
 
 #include <linux/proc_fs.h>
 
@@ -44,41 +46,33 @@ struct proc_dir_entry* lprocfs_srch(struct proc_dir_entry* head,
                                     const char* name);
 void lprocfs_remove_all(struct proc_dir_entry* root);
 struct proc_dir_entry* lprocfs_new_dir(struct proc_dir_entry* root,
-                                       const char* string, 
-                                       const char* tok);
-int lprocfs_new_vars(struct proc_dir_entry* root,
-                     lprocfs_vars_t* list,
-                     const char* tok, 
+                                       const char* string, const char* tok);
+int lprocfs_new_vars(struct proc_dir_entry* root, lprocfs_vars_t* list,
+                     const char* tok, void* data);
+int lprocfs_add_vars(struct proc_dir_entry* root, lprocfs_vars_t* var,
                      void* data);
-int lprocfs_add_vars(struct proc_dir_entry* root,
-                     lprocfs_vars_t* var, 
-                     void* data);
-int lprocfs_reg_obd(struct obd_device* device, 
-                    lprocfs_vars_t* list, 
+int lprocfs_reg_obd(struct obd_device* device, lprocfs_vars_t* list,
                     void* data);
 int lprocfs_dereg_obd(struct obd_device* device);
 struct proc_dir_entry* lprocfs_reg_mnt(char *mnt_name);
 int lprocfs_dereg_mnt(struct proc_dir_entry* root);
-int lprocfs_reg_class(struct obd_type* type,
-                      lprocfs_vars_t* list, 
-                      void* data);
+int lprocfs_reg_class(struct obd_type* type, lprocfs_vars_t* list, void* data);
 int lprocfs_dereg_class(struct obd_type* class);
 int lprocfs_reg_main(void);
 int lprocfs_dereg_main(void);
-int lprocfs_ll_rd(char *page, char **start, off_t off,
-                  int count, int *eof, void *data);
+int lprocfs_ll_rd(char *page, char **start, off_t off, int count, int *eof,
+                  void *data);
 #else
 
 
 static inline int lprocfs_add_vars(struct proc_dir_entry* root,
-                                  lprocfs_vars_t* var, 
-                                  void* data)
+                                  lprocfs_vars_t* var, void* data)
 {
         return 0;
 }
 
-static inline int lprocfs_reg_obd(struct obd_device* device, 
-                                 lprocfs_vars_t* list, 
+static inline int lprocfs_reg_obd(struct obd_device* device,
+                                 lprocfs_vars_t* list,
                                  void* data)
 {
         return 0;
@@ -86,14 +80,12 @@ static inline int lprocfs_reg_obd(struct obd_device* device,
 
 static inline int lprocfs_dereg_obd(struct obd_device* device)
 {
-
         return 0;
 }
 
 static inline struct proc_dir_entry* lprocfs_reg_mnt(char *name)
 {
         return 0;
-        
 }
 
 static inline int lprocfs_dereg_mnt(struct proc_dir_entry* root)
@@ -102,8 +94,7 @@ static inline int lprocfs_dereg_mnt(struct proc_dir_entry* root)
 }
 
 static inline int lprocfs_reg_class(struct obd_type* type,
-                                                       lprocfs_vars_t* list, 
-                                                       void* data)
+                                    lprocfs_vars_t* list, void* data)
 {
         return 0;
 }
@@ -111,15 +102,14 @@ static inline int lprocfs_reg_class(struct obd_type* type,
 static inline int lprocfs_dereg_class(struct obd_type* class)
 {
         return 0;
-
 }
-static inline int lprocfs_reg_main()
+
+static inline int lprocfs_reg_main(void)
 {
         return 0;
-
 }
 
-static inline int lprocfs_dereg_main()
+static inline int lprocfs_dereg_main(void)
 {
         return 0;
 }