From 9ad541aa34002eb0f3d19ba9512b713ffcaf77bc Mon Sep 17 00:00:00 2001 From: James Simmons Date: Mon, 4 Nov 2019 16:53:25 -0500 Subject: [PATCH] LU-12932 lod: restore qos_thresholdrr sysfs file The introduction of directory stripe allocation by space usage renamed the lod sysfs file qos_thresholdrr to lod_qos_thresholdrr but this breaks backwards compatiablity. Restore qos_thresholdrr. Fixes: c1d0a355a6 ("LU-12624 lod: alloc dir stripes by QoS") Change-Id: I93bf29cbec3c3a5a7a8527353aa8005ebd340ec5 Signed-off-by: James Simmons Reviewed-on: https://review.whamcloud.com/36667 Tested-by: jenkins Reviewed-by: Lai Siyao Tested-by: Maloo Reviewed-by: Andreas Dilger --- lustre/lod/lproc_lod.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lustre/lod/lproc_lod.c b/lustre/lod/lproc_lod.c index 8297ae3..6a64861 100644 --- a/lustre/lod/lproc_lod.c +++ b/lustre/lod/lproc_lod.c @@ -453,8 +453,8 @@ static ssize_t qos_prio_free_show(struct kobject *kobj, * Set QoS free space priority parameter. * * Set the relative priority of free OST space compared to OST load when OSTs - * are space imbalanced. See lod_qos_priofree_seq_show() for description of - * this parameter. See lod_qos_thresholdrr_seq_write() and lq_threshold_rr to + * are space imbalanced. See qos_priofree_show() for description of + * this parameter. See qos_thresholdrr_store() and lq_threshold_rr to * determine what constitutes "space imbalanced" OSTs. */ static ssize_t __qos_prio_free_store(struct kobject *kobj, @@ -522,7 +522,7 @@ static ssize_t mdt_qos_thresholdrr_show(struct kobject *kobj, return __qos_thresholdrr_show(kobj, attr, buf, true); } -static ssize_t lod_qos_thresholdrr_show(struct kobject *kobj, +static ssize_t qos_thresholdrr_show(struct kobject *kobj, struct attribute *attr, char *buf) { return __qos_thresholdrr_show(kobj, attr, buf, false); @@ -569,15 +569,15 @@ static ssize_t mdt_qos_thresholdrr_store(struct kobject *kobj, return __qos_thresholdrr_store(kobj, attr, buffer, count, true); } -static ssize_t lod_qos_thresholdrr_store(struct kobject *kobj, - struct attribute *attr, - const char *buffer, size_t count) +static ssize_t qos_thresholdrr_store(struct kobject *kobj, + struct attribute *attr, + const char *buffer, size_t count) { return __qos_thresholdrr_store(kobj, attr, buffer, count, false); } LUSTRE_RW_ATTR(mdt_qos_thresholdrr); -LUSTRE_RW_ATTR(lod_qos_thresholdrr); +LUSTRE_RW_ATTR(qos_thresholdrr); /** * Show expiration period used to refresh cached statfs data, which @@ -908,7 +908,7 @@ static struct attribute *lod_attrs[] = { &lustre_attr_numobd.attr, &lustre_attr_qos_maxage.attr, &lustre_attr_qos_prio_free.attr, - &lustre_attr_lod_qos_thresholdrr.attr, + &lustre_attr_qos_thresholdrr.attr, &lustre_attr_mdt_stripecount.attr, &lustre_attr_mdt_stripetype.attr, &lustre_attr_mdt_activeobd.attr, -- 1.8.3.1