Merge b_md to HEAD for 0.5.19 release.

[fs/lustre-release.git] / lustre / lov / lproc_lov.c

diff --git a/lustre/lov/lproc_lov.c b/lustre/lov/lproc_lov.c
index a68b57e..0812e00 100644 (file)
--- a/lustre/lov/lproc_lov.c
+++ b/lustre/lov/lproc_lov.c
@@ -28,139 +28,124 @@
  * Common STATUS namespace
  */
 
-int rd_uuid(char* page, char **start, off_t off, int count, int *eof, 
+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;
-        
-
+        return snprintf(page, count, "%s\n", dev->obd_uuid);
 }
-int rd_stripesize(char* page, char **start, off_t off, int count, int *eof, 
+
+int rd_stripesize(char *page, char **start, off_t off, int count, int *eof,
                   void *data)
 {
-        struct obd_device* dev = (struct obd_device*)data;
-        int len = 0; 
-        struct lov_obd* lov = &dev->u.lov;
-        len += snprintf(page, count, LPU64"\n", 
-                        (__u64)(lov->desc.ld_default_stripe_size));
-        
-        return len;
+        struct obd_device *dev = (struct obd_device*)data;
+        struct lov_desc *desc = &dev->u.lov.desc;
+
+        return snprintf(page, count, LPU64"\n", desc->ld_default_stripe_size);
 }
 
-int rd_stripeoffset(char* page, char **start, off_t off, int count, int *eof, 
+int rd_stripeoffset(char *page, char **start, off_t off, int count, int *eof,
                     void *data)
 {
         struct obd_device* dev = (struct obd_device*)data;
-        int len = 0;
         struct lov_obd* lov = &dev->u.lov;
-        len += snprintf(page, count, LPU64"\n", 
-                        lov->desc.ld_default_stripe_offset);
-        return len;
 
+        return snprintf(page, count, LPU64"\n",
+                        lov->desc.ld_default_stripe_offset);
 }
 
-int rd_stripetype(char* page, char **start, off_t off, int count, int *eof, 
+int rd_stripetype(char *page, char **start, off_t off, int count, int *eof,
                   void *data)
 {
         struct obd_device* dev = (struct obd_device*)data;
-        int len = 0;
         struct lov_obd* lov = &dev->u.lov;
-        len += snprintf(page, count, LPU64"\n", 
-                        (__u64)(lov->desc.ld_pattern));
-        return len;
 
+        return snprintf(page, count, "%u\n", lov->desc.ld_pattern);
 }
-int rd_stripecount(char* page, char **start, off_t off, int count, int *eof, 
+
+int rd_stripecount(char *page, char **start, off_t off, int count, int *eof,
                    void *data)
-{       
+{
         struct obd_device* dev = (struct obd_device*)data;
-        int len = 0;
         struct lov_obd* lov = &dev->u.lov;
-        len += snprintf(page, count, LPU64"\n", 
-                        (__u64)(lov->desc.ld_default_stripe_count));
-        return len;
 
+        return snprintf(page, count, "%u\n", lov->desc.ld_default_stripe_count);
 }
-int rd_numobd(char* page, char **start, off_t off, int count, int *eof, 
+
+int rd_numobd(char *page, char **start, off_t off, int count, int *eof,
               void *data)
-{       
-        struct obd_device* dev = (struct obd_device*)data;
-        int len = 0;
-        struct lov_obd* lov=&dev->u.lov;
-        len += snprintf(page, count, LPU64"\n", 
-                        (__u64)(lov->desc.ld_tgt_count));
-        return len;
+{
+        struct obd_device *dev = (struct obd_device*)data;
+        struct lov_obd *lov = &dev->u.lov;
+
+        return snprintf(page, count, "%u\n", lov->desc.ld_tgt_count);
 
 }
 
-int rd_activeobd(char* page, char **start, off_t off, int count, int *eof, 
+int rd_activeobd(char *page, char **start, off_t off, int count, int *eof,
                  void *data)
-{       
+{
         struct obd_device* dev = (struct obd_device*)data;
-        int len = 0;
         struct lov_obd* lov = &dev->u.lov;
-        len += snprintf(page, count, LPU64"\n", 
-                        (__u64)(lov->desc.ld_active_tgt_count));
-        return len;
 
+        return snprintf(page, count, "%u\n", lov->desc.ld_active_tgt_count);
 }
 
-int rd_blksize(char* page, char **start, off_t off, int count, int *eof, 
+int rd_blksize(char *page, char **start, off_t off, int count, int *eof,
                void *data)
 {
         return 0;
 }
 
 
-int rd_kbtotal(char* page, char **start, off_t off, int count, int *eof, 
+int rd_kbtotal(char *page, char **start, off_t off, int count, int *eof,
                void *data)
 {
         return 0;
 }
 
 
-int rd_kbfree(char* page, char **start, off_t off, int count, int *eof, 
+int rd_kbfree(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, 
+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, 
+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)
+int rd_filegroups(char* page, char **start, off_t off, int count, int *eof,
+                  void *data)
 {
         return 0;
 }
 
-int rd_target(char* page, char **start, off_t off, int count, int *eof, 
+int rd_target(char *page, char **start, off_t off, int count, int *eof,
               void *data)
 {
         struct obd_device* dev = (struct obd_device*)data;
         int len = 0, i = 0;
         struct lov_obd* lov = &dev->u.lov;
         struct lov_tgt_desc* tgts = lov->tgts;
-        while(i < lov->desc.ld_tgt_count){
-                len += snprintf(&page[len], count, "%d: %s\n", i, tgts->uuid);
+        while (i < lov->desc.ld_tgt_count) {
+                len += snprintf(&page[len], count - len, "%d: %s %sACTIVE\n",
+                                i, tgts->uuid, tgts->active ? "" : "IN");
                 i++;
                 tgts++;
         }
-        
+
         return len;
 }
+
 int rd_mdc(char* page, char **start, off_t off, int count, int *eof, void *data)
 {
         struct obd_device* dev = (struct obd_device*)data;
@@ -186,16 +171,15 @@ struct lprocfs_vars status_var_nm_1[] = {
         {"status/kbytesfree", rd_kbfree, 0, 0},
         {"status/target_obd", rd_target, 0, 0},
         {"status/target_mdc", rd_mdc, 0, 0},
-       
         {0}
 };
-int rd_numrefs(char* page, char **start, off_t off, int count, int *eof, 
+
+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;
+
+        return snprintf(page, count, "%d\n", class->typ_refcnt);
 }
 
 struct lprocfs_vars status_class_var[]={