un-do __u32 changes from bz-13289 which are causing compile errors

when building with --enable-snmp because the snmp code does not use
the same header files as the rest of the lustre code.

diff --git a/snmp/lustre-snmp-util.c b/snmp/lustre-snmp-util.c
index 1e52a22..8048f2d 100644 (file)
--- a/snmp/lustre-snmp-util.c
+++ b/snmp/lustre-snmp-util.c
@@ -59,7 +59,7 @@
  *
  *********************************************************************/
 
  *
  *********************************************************************/
 

-char *get_file_list(const char *dirname, int file_type, __u32 *count)
+char *get_file_list(const char *dirname, int file_type, uint32_t *count)

 {
 
     DIR           *pdir = NULL;
 {
 
     DIR           *pdir = NULL;


@@ -570,7 +570,7 @@ var_genericTable(struct variable *vp,
             struct oid_table *ptable)
 {
     char *dir_list;
             struct oid_table *ptable)
 {
     char *dir_list;

-    __u32 num;
+    uint32_t num;

     int  deviceindex;
     unsigned char *ret_val = NULL;
     int i=0;
     int  deviceindex;
     unsigned char *ret_val = NULL;
     int i=0;

diff --git a/snmp/lustre-snmp-util.h b/snmp/lustre-snmp-util.h
index 56770a2..087e8cc 100644 (file)
--- a/snmp/lustre-snmp-util.h
+++ b/snmp/lustre-snmp-util.h
@@ -154,7 +154,7 @@ typedef enum {
 } lustre_sysstatus;
 
 /* File operation related functions */
 } lustre_sysstatus;
 
 /* File operation related functions */

-char *get_file_list(const char *dirname, int file_type, __u32 *count);
+char *get_file_list(const char *dirname, int file_type, uint32_t *count);

 extern int  is_directory(const char *filename);
 extern int  read_string(const char *filepath, char *lustre_var,size_t var_size);
 int read_counter64(const char *file_path, counter64 *c64,int factor);
 extern int  is_directory(const char *filename);
 extern int  read_string(const char *filepath, char *lustre_var,size_t var_size);
 int read_counter64(const char *file_path, counter64 *c64,int factor);

diff --git a/snmp/lustre-snmp.c b/snmp/lustre-snmp.c
index b80e2ac..0de2c4d 100644 (file)
--- a/snmp/lustre-snmp.c
+++ b/snmp/lustre-snmp.c
@@ -204,7 +204,7 @@ var_clusterFileSystems(struct variable *vp,
   static u_long ulong_ret;
   static unsigned char string[SPRINT_MAX_LEN];
   char file_path[MAX_PATH_SIZE];
   static u_long ulong_ret;
   static unsigned char string[SPRINT_MAX_LEN];
   char file_path[MAX_PATH_SIZE];

-  __u32 num;
+  uint32_t num;

   char *dir_list;
 
   if (header_generic(vp,name,length,exact,var_len,write_method)
   char *dir_list;
 
   if (header_generic(vp,name,length,exact,var_len,write_method)