1. Bug fix for Bug #320, also needs repair of lconf, since it tries

[fs/lustre-release.git] / lustre / obdfilter / lproc_obdfilter.c

diff --git a/lustre/obdfilter/lproc_obdfilter.c b/lustre/obdfilter/lproc_obdfilter.c
index a559466..48c5382 100644 (file)
--- a/lustre/obdfilter/lproc_obdfilter.c
+++ b/lustre/obdfilter/lproc_obdfilter.c
@@ -25,127 +25,115 @@
 #include <linux/lprocfs_status.h>
 
 
-int rd_uuid(char* page, char **start, off_t off,
-               int count, int *eof, void *data)
+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);
+        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)
+int rd_blksize(char* page, char **start, off_t off, int count, int *eof, 
+               void *data)
 {
-        struct obd_device* temp=(struct obd_device*)data;
+        struct obd_device* temp = (struct obd_device*)data;
         struct statfs mystats;
-
-        int len=0;
+        int len = 0;
 
         vfs_statfs(temp->u.filter.fo_sb, &mystats);
-
         len+=snprintf(page, count, "%ld\n", mystats.f_bsize); 
         return len;
-        
-
 }
-int rd_kbtotal(char* page, char **start, off_t off,
-                int count, int *eof, void *data)
+int rd_kbtotal(char* page, char **start, off_t off, int count, int *eof, 
+               void *data)
 {
-        struct obd_device* temp=(struct obd_device*)data;
+        struct obd_device* temp = (struct obd_device*)data;
         struct statfs mystats;
-        int len=0;
+        int len = 0;
+        __u32 blk_size;
         __u64 result;
 
         vfs_statfs(temp->u.filter.fo_sb, &mystats);
-        
-        result=((__u64)(mystats.f_blocks*mystats.f_bsize))>>10;
-
+        blk_size = mystats.f_bsize;
+        blk_size >>= 10;
+        result = mystats.f_blocks;
+        while(blk_size >>= 1){
+                result <<= 1;
+        }
         len+=snprintf(page, count, LPU64"\n", result); 
-
         return len;   
 }
 
-int rd_kbfree(char* page, char **start, off_t off,
-               int count, int *eof, void *data)
+int rd_kbfree(char* page, char **start, off_t off, int count, int *eof, 
+              void *data)
 {
-        struct obd_device* temp=(struct obd_device*)data;
+        struct obd_device* temp = (struct obd_device*)data;
         struct statfs mystats;
-
-        int len=0;
+        int len = 0;
+        __u32 blk_size;
         __u64 result;
 
         vfs_statfs(temp->u.filter.fo_sb, &mystats);
-        result=((__u64)(mystats.f_bfree*mystats.f_bsize))>>10;
-
-        len+=snprintf(page, count, LPU64"\n", result); 
+        blk_size = mystats.f_bsize;
+        blk_size >>= 10;
+        result = mystats.f_bfree;
+        while(blk_size >>= 1){
+                result <<= 1;
+        }
+        len += snprintf(page, count, LPU64"\n", result); 
         return len;     
 }
 
-int rd_fstype(char* page, char **start, off_t off,
-                  int count, int *eof, void *data)
+int rd_fstype(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->u.filter.fo_fstype);
+        struct obd_device* temp = (struct obd_device*)data;
+        int len = 0;
+        len += snprintf(page, count, "%s\n", temp->u.filter.fo_fstype);
         return len;
-        
 }
-int rd_files(char* page, char **start, off_t off,
-              int count, int *eof, void *data)
+int rd_files(char* page, char **start, off_t off, int count, int *eof, 
+             void *data)
 { 
-        
-        struct obd_device* temp=(struct obd_device*)data;
+        struct obd_device* temp = (struct obd_device*)data;
         struct statfs mystats;
-
-         int len=0;
-
-         vfs_statfs(temp->u.filter.fo_sb, &mystats);
-
-         len+=snprintf(page, count, "%ld\n", mystats.f_files); 
+        int len = 0;
+        vfs_statfs(temp->u.filter.fo_sb, &mystats);
+        len += snprintf(page, count, "%ld\n", mystats.f_files); 
         return len;
 }
 
-int rd_filesfree(char* page, char **start, off_t off,
-                  int count, int *eof, void *data)
+int rd_filesfree(char* page, char **start, off_t off, int count, int *eof, 
+                 void *data)
 {
-        struct obd_device* temp=(struct obd_device*)data;
+        struct obd_device* temp = (struct obd_device*)data;
         struct statfs mystats;
-        
-        int len=0;
-        
+        int len = 0;
         vfs_statfs(temp->u.filter.fo_sb, &mystats);
-        
-        len+=snprintf(page, count, "%ld\n", mystats.f_ffree); 
+        len += snprintf(page, count, "%ld\n", mystats.f_ffree); 
         return len;
-        
-        
 }
 
-struct lprocfs_vars status_var_nm_1[]={
-        {"status/uuid", rd_uuid, 0},
-        {"status/blocksize",rd_blksize, 0},
-        {"status/kbytestotal",rd_kbtotal, 0},
-        {"status/kbytesfree", rd_kbfree, 0},
-        {"status/files", rd_files, 0},
-        {"status/filesfree", rd_filesfree, 0},
-        {"status/fstype", rd_fstype, 0},
+struct lprocfs_vars status_var_nm_1[] = {
+        {"status/uuid", rd_uuid, 0, 0},
+        {"status/blocksize",rd_blksize, 0, 0},
+        {"status/kbytestotal",rd_kbtotal, 0, 0},
+        {"status/kbytesfree", rd_kbfree, 0, 0},
+        {"status/files", rd_files, 0, 0},
+        {"status/filesfree", rd_filesfree, 0, 0},
+        {"status/fstype", rd_fstype, 0, 0},
         {0}
 };
-int rd_numdevices(char* page, char **start, off_t off,
-                  int count, int *eof, void *data)
+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);
+        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_devices", rd_numdevices, 0},
+struct lprocfs_vars status_class_var[] = {
+        {"status/num_refs", rd_numrefs, 0, 0},
         {0}
 };