staging: lustre: obd: rename health sysfs file to health_check

Testing revealed that the sysfs file health is actually the
wrong name. Rename to the proper name health_check.

Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
index be09e04b042f43de6ede301d160ebf3818e73532..9f5e8299d7e4b3c22643f599e4ec42504a263cc8 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
@@ -217,8 +217,8 @@ static ssize_t pinger_show(struct kobject *kobj, struct attribute *attr,
        return sprintf(buf, "%s\n", "on");
 }
 
-static ssize_t health_show(struct kobject *kobj, struct attribute *attr,
-                          char *buf)
+static ssize_t
+health_check_show(struct kobject *kobj, struct attribute *attr, char *buf)
 {
        bool healthy = true;
        int i;
@@ -311,14 +311,14 @@ EXPORT_SYMBOL_GPL(debugfs_lustre_root);
 
 LUSTRE_RO_ATTR(version);
 LUSTRE_RO_ATTR(pinger);
-LUSTRE_RO_ATTR(health);
+LUSTRE_RO_ATTR(health_check);
 LUSTRE_RW_ATTR(jobid_var);
 LUSTRE_RW_ATTR(jobid_name);
 
 static struct attribute *lustre_attrs[] = {
        &lustre_attr_version.attr,
        &lustre_attr_pinger.attr,
-       &lustre_attr_health.attr,
+       &lustre_attr_health_check.attr,
        &lustre_attr_jobid_name.attr,
        &lustre_attr_jobid_var.attr,
        NULL,

diff --git a/drivers/staging/lustre/sysfs-fs-lustre b/drivers/staging/lustre/sysfs-fs-lustre
index 20206ba965affe333423de87fe6b470a026953ba..8691c6543a9c0f76d9926793e8af726fa957cede 100644 (file)
--- a/drivers/staging/lustre/sysfs-fs-lustre
+++ b/drivers/staging/lustre/sysfs-fs-lustre
@@ -11,7 +11,7 @@ Description:
                Shows if the lustre module has pinger support.
                "on" means yes and "off" means no.
 
-What:          /sys/fs/lustre/health
+What:          /sys/fs/lustre/health_check
 Date:          May 2015
 Contact:       "Oleg Drokin" <oleg.drokin@intel.com>
 Description: