LU-7486 obdclass: health_check to report unhealthy upon LBUG

[fs/lustre-release.git] / lustre / obdclass / linux / linux-module.c

diff --git a/lustre/obdclass/linux/linux-module.c b/lustre/obdclass/linux/linux-module.c
index 200d19f..37cbd24 100644 (file)
--- a/lustre/obdclass/linux/linux-module.c
+++ b/lustre/obdclass/linux/linux-module.c
@@ -73,7 +73,6 @@
 #include <lprocfs_status.h>
 #include <lustre_ioctl.h>
 #include <lustre_ver.h>
-#include <lustre/lustre_build_version.h>
 
 int proc_version;
 
@@ -215,21 +214,21 @@ struct miscdevice obd_psdev = {
 #ifdef CONFIG_PROC_FS
 static int obd_proc_version_seq_show(struct seq_file *m, void *v)
 {
-       return seq_printf(m, "lustre: %s\nkernel: %s\nbuild:  %s\n",
-                         LUSTRE_VERSION_STRING, "patchless_client",
-                         BUILD_VERSION);
+       seq_printf(m, "lustre: %s", LUSTRE_VERSION_STRING);
+       return 0;
 }
 LPROC_SEQ_FOPS_RO(obd_proc_version);
 
 static int obd_proc_pinger_seq_show(struct seq_file *m, void *v)
 {
-       return seq_printf(m, "%s\n",
+       seq_printf(m, "%s\n",
 #ifdef ENABLE_PINGER
-                            "on"
+                  "on"
 #else
-                            "off"
+                  "off"
 #endif
-                        );
+                );
+       return 0;
 }
 LPROC_SEQ_FOPS_RO(obd_proc_pinger);
 
@@ -246,8 +245,10 @@ static int obd_proc_health_seq_show(struct seq_file *m, void *data)
        bool healthy = true;
        int i;
 
-       if (libcfs_catastrophe)
+       if (libcfs_catastrophe) {
                seq_printf(m, "LBUG\n");
+               healthy = false;
+       }
 
        read_lock(&obd_dev_lock);
        for (i = 0; i < class_devno_max(); i++) {
@@ -266,7 +267,7 @@ static int obd_proc_health_seq_show(struct seq_file *m, void *data)
 
                if (obd_health_check(NULL, obd)) {
                        seq_printf(m, "device %s reported unhealthy\n",
-                                       obd->obd_name);
+                                  obd->obd_name);
                        healthy = false;
                }
                class_decref(obd, __FUNCTION__, current);
@@ -275,9 +276,9 @@ static int obd_proc_health_seq_show(struct seq_file *m, void *data)
        read_unlock(&obd_dev_lock);
 
        if (healthy)
-               return seq_printf(m, "healthy\n");
-
-       seq_printf(m, "NOT HEALTHY\n");
+               seq_puts(m, "healthy\n");
+       else
+               seq_puts(m, "NOT HEALTHY\n");
        return 0;
 }
 LPROC_SEQ_FOPS_RO(obd_proc_health);
@@ -405,10 +406,11 @@ static int obd_device_list_seq_show(struct seq_file *p, void *v)
         else
                 status = "--";
 
-        return seq_printf(p, "%3d %s %s %s %s %d\n",
-                          (int)index, status, obd->obd_type->typ_name,
-                          obd->obd_name, obd->obd_uuid.uuid,
-                         atomic_read(&obd->obd_refcount));
+       seq_printf(p, "%3d %s %s %s %s %d\n",
+                  (int)index, status, obd->obd_type->typ_name,
+                  obd->obd_name, obd->obd_uuid.uuid,
+                  atomic_read(&obd->obd_refcount));
+       return 0;
 }
 
 static const struct seq_operations obd_device_list_sops = {