Skip to contentSkip to conversation

ceph: eliminate unused "total" variable in ceph_mdsc_send_metrics

PATCH In review Jeff Layton 2 participants 3 messages Jul 24, 2020 Ceph client

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ceph: eliminate unused "total" variable in ceph_mdsc_send_metrics

---
 fs/ceph/metric.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
fs/ceph/metric.c +1 -4
index 252d6a3f75d2..2466b261fba2 100644
@@ -20,7 +20,7 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc,
 	u64 nr_caps = atomic64_read(&m->total_caps);
 	struct ceph_msg *msg;
 	struct timespec64 ts;
-	s64 sum, total;
+	s64 sum;
 	s32 items = 0;
 	s32 len;
 
@@ -53,7 +53,6 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc,
 	read->ver = 1;
 	read->compat = 1;
 	read->data_len = cpu_to_le32(sizeof(*read) - 10);
-	total = m->total_reads;
 	sum = m->read_latency_sum;
 	jiffies_to_timespec64(sum, &ts);
 	read->sec = cpu_to_le32(ts.tv_sec);
@@ -66,7 +65,6 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc,
 	write->ver = 1;
 	write->compat = 1;
 	write->data_len = cpu_to_le32(sizeof(*write) - 10);
-	total = m->total_writes;
 	sum = m->write_latency_sum;
 	jiffies_to_timespec64(sum, &ts);
 	write->sec = cpu_to_le32(ts.tv_sec);
@@ -79,7 +77,6 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc,
 	meta->ver = 1;
 	meta->compat = 1;
 	meta->data_len = cpu_to_le32(sizeof(*meta) - 10);
-	total = m->total_metadatas;
 	sum = m->metadata_latency_sum;
 	jiffies_to_timespec64(sum, &ts);
 	meta->sec = cpu_to_le32(ts.tv_sec);
Signature · 1 line
2.26.2
#1 lore raw
Quoted 7 lines · Jeff Layton
---
 fs/ceph/metric.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Xiubo, if this looks OK I can squash this into the original patch since it's not merged upstream yet.

Thanks,
Jeff

Quoted 37 lines
fs/ceph/metric.c +1 -4
index 252d6a3f75d2..2466b261fba2 100644
@@ -20,7 +20,7 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc,
 	u64 nr_caps = atomic64_read(&m->total_caps);
 	struct ceph_msg *msg;
 	struct timespec64 ts;
-	s64 sum, total;
+	s64 sum;
 	s32 items = 0;
 	s32 len;
 
@@ -53,7 +53,6 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc,
 	read->ver = 1;
 	read->compat = 1;
 	read->data_len = cpu_to_le32(sizeof(*read) - 10);
-	total = m->total_reads;
 	sum = m->read_latency_sum;
 	jiffies_to_timespec64(sum, &ts);
 	read->sec = cpu_to_le32(ts.tv_sec);
@@ -66,7 +65,6 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc,
 	write->ver = 1;
 	write->compat = 1;
 	write->data_len = cpu_to_le32(sizeof(*write) - 10);
-	total = m->total_writes;
 	sum = m->write_latency_sum;
 	jiffies_to_timespec64(sum, &ts);
 	write->sec = cpu_to_le32(ts.tv_sec);
@@ -79,7 +77,6 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc,
 	meta->ver = 1;
 	meta->compat = 1;
 	meta->data_len = cpu_to_le32(sizeof(*meta) - 10);
-	total = m->total_metadatas;
 	sum = m->metadata_latency_sum;
 	jiffies_to_timespec64(sum, &ts);
 	meta->sec = cpu_to_le32(ts.tv_sec);
Signature · 1 line
Jeff Layton <[email protected]>
#2 lore raw
Quoted 10 lines · Jeff Layton
Quoted 7 lines · Jeff Layton
---
  fs/ceph/metric.c | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)

Xiubo, if this looks OK I can squash this into the original patch since it's not merged upstream yet.

Hi Jeff,

Yeah, this is okay. Thanks.

BRs

Quoted 40 lines

Thanks,
Jeff

Quoted 37 lines
fs/ceph/metric.c +1 -4
index 252d6a3f75d2..2466b261fba2 100644
@@ -20,7 +20,7 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc,
  	u64 nr_caps = atomic64_read(&m->total_caps);
  	struct ceph_msg *msg;
  	struct timespec64 ts;
-	s64 sum, total;
+	s64 sum;
  	s32 items = 0;
  	s32 len;
 
@@ -53,7 +53,6 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc,
  	read->ver = 1;
  	read->compat = 1;
  	read->data_len = cpu_to_le32(sizeof(*read) - 10);
-	total = m->total_reads;
  	sum = m->read_latency_sum;
  	jiffies_to_timespec64(sum, &ts);
  	read->sec = cpu_to_le32(ts.tv_sec);
@@ -66,7 +65,6 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc,
  	write->ver = 1;
  	write->compat = 1;
  	write->data_len = cpu_to_le32(sizeof(*write) - 10);
-	total = m->total_writes;
  	sum = m->write_latency_sum;
  	jiffies_to_timespec64(sum, &ts);
  	write->sec = cpu_to_le32(ts.tv_sec);
@@ -79,7 +77,6 @@ static bool ceph_mdsc_send_metrics(struct ceph_mds_client *mdsc,
  	meta->ver = 1;
  	meta->compat = 1;
  	meta->data_len = cpu_to_le32(sizeof(*meta) - 10);
-	total = m->total_metadatas;
  	sum = m->metadata_latency_sum;
  	jiffies_to_timespec64(sum, &ts);
  	meta->sec = cpu_to_le32(ts.tv_sec);