ceph: rename the metric helpers

[platform/kernel/linux-rpi.git] / fs / ceph / metric.c

diff --git a/fs/ceph/metric.c b/fs/ceph/metric.c
index 5ec94bd..75d309f 100644 (file)
--- a/fs/ceph/metric.c
+++ b/fs/ceph/metric.c
@@ -183,21 +183,21 @@ int ceph_metric_init(struct ceph_client_metric *m)
        if (ret)
                goto err_i_caps_mis;
 
-       spin_lock_init(&m->read_latency_lock);
+       spin_lock_init(&m->read_metric_lock);
        m->read_latency_sq_sum = 0;
        m->read_latency_min = KTIME_MAX;
        m->read_latency_max = 0;
        m->total_reads = 0;
        m->read_latency_sum = 0;
 
-       spin_lock_init(&m->write_latency_lock);
+       spin_lock_init(&m->write_metric_lock);
        m->write_latency_sq_sum = 0;
        m->write_latency_min = KTIME_MAX;
        m->write_latency_max = 0;
        m->total_writes = 0;
        m->write_latency_sum = 0;
 
-       spin_lock_init(&m->metadata_latency_lock);
+       spin_lock_init(&m->metadata_metric_lock);
        m->metadata_latency_sq_sum = 0;
        m->metadata_latency_min = KTIME_MAX;
        m->metadata_latency_max = 0;
@@ -274,7 +274,7 @@ static inline void __update_latency(ktime_t *totalp, ktime_t *lsump,
        *sq_sump += sq;
 }
 
-void ceph_update_read_latency(struct ceph_client_metric *m,
+void ceph_update_read_metrics(struct ceph_client_metric *m,
                              ktime_t r_start, ktime_t r_end,
                              int rc)
 {
@@ -283,14 +283,14 @@ void ceph_update_read_latency(struct ceph_client_metric *m,
        if (unlikely(rc < 0 && rc != -ENOENT && rc != -ETIMEDOUT))
                return;
 
-       spin_lock(&m->read_latency_lock);
+       spin_lock(&m->read_metric_lock);
        __update_latency(&m->total_reads, &m->read_latency_sum,
                         &m->read_latency_min, &m->read_latency_max,
                         &m->read_latency_sq_sum, lat);
-       spin_unlock(&m->read_latency_lock);
+       spin_unlock(&m->read_metric_lock);
 }
 
-void ceph_update_write_latency(struct ceph_client_metric *m,
+void ceph_update_write_metrics(struct ceph_client_metric *m,
                               ktime_t r_start, ktime_t r_end,
                               int rc)
 {
@@ -299,14 +299,14 @@ void ceph_update_write_latency(struct ceph_client_metric *m,
        if (unlikely(rc && rc != -ETIMEDOUT))
                return;
 
-       spin_lock(&m->write_latency_lock);
+       spin_lock(&m->write_metric_lock);
        __update_latency(&m->total_writes, &m->write_latency_sum,
                         &m->write_latency_min, &m->write_latency_max,
                         &m->write_latency_sq_sum, lat);
-       spin_unlock(&m->write_latency_lock);
+       spin_unlock(&m->write_metric_lock);
 }
 
-void ceph_update_metadata_latency(struct ceph_client_metric *m,
+void ceph_update_metadata_metrics(struct ceph_client_metric *m,
                                  ktime_t r_start, ktime_t r_end,
                                  int rc)
 {
@@ -315,9 +315,9 @@ void ceph_update_metadata_latency(struct ceph_client_metric *m,
        if (unlikely(rc && rc != -ENOENT))
                return;
 
-       spin_lock(&m->metadata_latency_lock);
+       spin_lock(&m->metadata_metric_lock);
        __update_latency(&m->total_metadatas, &m->metadata_latency_sum,
                         &m->metadata_latency_min, &m->metadata_latency_max,
                         &m->metadata_latency_sq_sum, lat);
-       spin_unlock(&m->metadata_latency_lock);
+       spin_unlock(&m->metadata_metric_lock);
 }