From 41617539e5e0d9f867f6e59762d71bbc7604cab3 Mon Sep 17 00:00:00 2001 From: Mike Snitzer Date: Tue, 6 Aug 2013 15:37:04 -0400 Subject: [PATCH 18/19] dm stat: rename struct dm_stat_shared variables from 's' to 'shared' --- drivers/md/dm-stats.c | 124 ++++++++++++++++++++++++------------------------ 1 files changed, 62 insertions(+), 62 deletions(-) diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c index 28c21ea..c996c37 100644 --- a/drivers/md/dm-stats.c +++ b/drivers/md/dm-stats.c @@ -168,9 +168,9 @@ static void dm_stat_free(struct rcu_head *head) kvfree(m, m->shared_alloc_size); } -static int dm_stat_in_flight(struct dm_stat_shared *s) +static int dm_stat_in_flight(struct dm_stat_shared *shared) { - return atomic_read(&s->in_flight[0]) + atomic_read(&s->in_flight[1]); + return atomic_read(&shared->in_flight[0]) + atomic_read(&shared->in_flight[1]); } void dm_stats_init_device(struct dm_stats *stats) @@ -196,16 +196,16 @@ void dm_stats_exit_device(struct dm_stats *stats) struct dm_stat *m = container_of(stats->list.next, struct dm_stat, list_entry); list_del(&m->list_entry); for (ni = 0; ni < m->n_entries; ni++) { - struct dm_stat_shared *s = &m->stat_shared[ni]; - if (WARN_ON(dm_stat_in_flight(s))) { + struct dm_stat_shared *shared = &m->stat_shared[ni]; + if (WARN_ON(dm_stat_in_flight(shared))) { DMERR("leaked in-flight counter at index " "%lu (start %llu, end %llu, step %llu): reads %d, writes %d\n", (unsigned long)ni, (unsigned long long)m->start, (unsigned long long)m->end, (unsigned long long)m->step, - atomic_read(&s->in_flight[0]), - atomic_read(&s->in_flight[1])); + atomic_read(&shared->in_flight[0]), + atomic_read(&shared->in_flight[1])); } } dm_stat_free(&m->rcu_head); @@ -392,7 +392,7 @@ static int dm_stats_list(struct dm_stats *stats, const char *program, return 1; } -static void dm_stat_round(struct dm_stat_shared *s, struct dm_stat_percpu *p) +static void dm_stat_round(struct dm_stat_shared *shared, struct dm_stat_percpu *p) { /* * This is racy, but so is part_round_stats_single. @@ -400,12 +400,12 @@ static void dm_stat_round(struct dm_stat_shared *s, struct dm_stat_percpu *p) unsigned long now = jiffies; unsigned in_flight_read; unsigned in_flight_write; - unsigned long difference = now - s->stamp; + unsigned long difference = now - shared->stamp; if (!difference) return; - in_flight_read = atomic_read(&s->in_flight[0]); - in_flight_write = atomic_read(&s->in_flight[1]); + in_flight_read = atomic_read(&shared->in_flight[0]); + in_flight_write = atomic_read(&shared->in_flight[1]); if (in_flight_read) p->io_ticks[0] += difference; if (in_flight_write) @@ -414,7 +414,7 @@ static void dm_stat_round(struct dm_stat_shared *s, struct dm_stat_percpu *p) p->io_ticks_total += difference; p->time_in_queue += (in_flight_read + in_flight_write) * difference; } - s->stamp = now; + shared->stamp = now; } static void dm_stat_for_entry(struct dm_stat *m, size_t entry, @@ -422,7 +422,7 @@ static void dm_stat_for_entry(struct dm_stat *m, size_t entry, bool end, unsigned long duration) { unsigned long idx = bi_rw & REQ_WRITE; - struct dm_stat_shared *s = &m->stat_shared[entry]; + struct dm_stat_shared *shared = &m->stat_shared[entry]; struct dm_stat_percpu *p; /* @@ -442,11 +442,11 @@ static void dm_stat_for_entry(struct dm_stat *m, size_t entry, p = &m->stat_percpu[smp_processor_id()][entry]; if (!end) { - dm_stat_round(s, p); - atomic_inc(&s->in_flight[idx]); + dm_stat_round(shared, p); + atomic_inc(&shared->in_flight[idx]); } else { - dm_stat_round(s, p); - atomic_dec(&s->in_flight[idx]); + dm_stat_round(shared, p); + atomic_dec(&shared->in_flight[idx]); p->sectors[idx] += len; p->ios[idx] += 1; p->ios_merged[idx] += merged; @@ -527,7 +527,7 @@ void dm_stats_bio(struct dm_stats *stats, rcu_read_unlock(); } -static void __dm_stat_init_temporary_percpu_totals(struct dm_stat_shared *s, +static void __dm_stat_init_temporary_percpu_totals(struct dm_stat_shared *shared, struct dm_stat *m, size_t x) { int cpu; @@ -535,24 +535,24 @@ static void __dm_stat_init_temporary_percpu_totals(struct dm_stat_shared *s, local_irq_disable(); p = &m->stat_percpu[smp_processor_id()][x]; - dm_stat_round(s, p); + dm_stat_round(shared, p); local_irq_enable(); - memset(&s->tmp, 0, sizeof(s->tmp)); + memset(&shared->tmp, 0, sizeof(shared->tmp)); for_each_possible_cpu(cpu) { p = &m->stat_percpu[cpu][x]; - s->tmp.sectors[0] += p->sectors[0]; - s->tmp.sectors[1] += p->sectors[1]; - s->tmp.ios[0] += p->ios[0]; - s->tmp.ios[1] += p->ios[1]; - s->tmp.ios_merged[0] += p->ios_merged[0]; - s->tmp.ios_merged[1] += p->ios_merged[1]; - s->tmp.ticks[0] += p->ticks[0]; - s->tmp.ticks[1] += p->ticks[1]; - s->tmp.io_ticks[0] += p->io_ticks[0]; - s->tmp.io_ticks[1] += p->io_ticks[1]; - s->tmp.io_ticks_total += p->io_ticks_total; - s->tmp.time_in_queue += p->time_in_queue; + shared->tmp.sectors[0] += p->sectors[0]; + shared->tmp.sectors[1] += p->sectors[1]; + shared->tmp.ios[0] += p->ios[0]; + shared->tmp.ios[1] += p->ios[1]; + shared->tmp.ios_merged[0] += p->ios_merged[0]; + shared->tmp.ios_merged[1] += p->ios_merged[1]; + shared->tmp.ticks[0] += p->ticks[0]; + shared->tmp.ticks[1] += p->ticks[1]; + shared->tmp.io_ticks[0] += p->io_ticks[0]; + shared->tmp.io_ticks[1] += p->io_ticks[1]; + shared->tmp.io_ticks_total += p->io_ticks_total; + shared->tmp.time_in_queue += p->time_in_queue; } } @@ -560,27 +560,27 @@ static void __dm_stat_clear(struct dm_stat *m, size_t idx_start, size_t idx_end, bool init_tmp_percpu_totals) { size_t x; - struct dm_stat_shared *s; + struct dm_stat_shared *shared; struct dm_stat_percpu *p; for (x = idx_start; x < idx_end; x++) { - s = &m->stat_shared[x]; + shared = &m->stat_shared[x]; if (init_tmp_percpu_totals) - __dm_stat_init_temporary_percpu_totals(s, m, x); + __dm_stat_init_temporary_percpu_totals(shared, m, x); local_irq_disable(); p = &m->stat_percpu[smp_processor_id()][x]; - p->sectors[0] -= s->tmp.sectors[0]; - p->sectors[1] -= s->tmp.sectors[1]; - p->ios[0] -= s->tmp.ios[0]; - p->ios[1] -= s->tmp.ios[1]; - p->ios_merged[0] -= s->tmp.ios_merged[0]; - p->ios_merged[1] -= s->tmp.ios_merged[1]; - p->ticks[0] -= s->tmp.ticks[0]; - p->ticks[1] -= s->tmp.ticks[1]; - p->io_ticks[0] -= s->tmp.io_ticks[0]; - p->io_ticks[1] -= s->tmp.io_ticks[1]; - p->io_ticks_total -= s->tmp.io_ticks_total; - p->time_in_queue -= s->tmp.time_in_queue; + p->sectors[0] -= shared->tmp.sectors[0]; + p->sectors[1] -= shared->tmp.sectors[1]; + p->ios[0] -= shared->tmp.ios[0]; + p->ios[1] -= shared->tmp.ios[1]; + p->ios_merged[0] -= shared->tmp.ios_merged[0]; + p->ios_merged[1] -= shared->tmp.ios_merged[1]; + p->ticks[0] -= shared->tmp.ticks[0]; + p->ticks[1] -= shared->tmp.ticks[1]; + p->io_ticks[0] -= shared->tmp.io_ticks[0]; + p->io_ticks[1] -= shared->tmp.io_ticks[1]; + p->io_ticks_total -= shared->tmp.io_ticks_total; + p->time_in_queue -= shared->tmp.time_in_queue; local_irq_enable(); } } @@ -633,7 +633,7 @@ static int dm_stats_print(struct dm_stats *stats, int id, size_t x; sector_t start, end; size_t idx_end; - struct dm_stat_shared *s; + struct dm_stat_shared *shared; mutex_lock(&stats->mutex); @@ -654,29 +654,29 @@ static int dm_stats_print(struct dm_stats *stats, int id, start = m->start + m->step * idx_start; for (x = idx_start; x < idx_end; x++, start = end) { - s = &m->stat_shared[x]; + shared = &m->stat_shared[x]; end = start + m->step; if (unlikely(end > m->end)) end = m->end; - __dm_stat_init_temporary_percpu_totals(s, m, x); + __dm_stat_init_temporary_percpu_totals(shared, m, x); DMEMIT("%llu-%llu %llu %llu %llu %llu %llu %llu %llu %llu %d %llu %llu %llu %llu\n", (unsigned long long)start, (unsigned long long)end, - s->tmp.ios[0], - s->tmp.ios_merged[0], - s->tmp.sectors[0], - jtom(s->tmp.ticks[0]), - s->tmp.ios[1], - s->tmp.ios_merged[1], - s->tmp.sectors[1], - jtom(s->tmp.ticks[1]), - dm_stat_in_flight(s), - jtom(s->tmp.io_ticks_total), - jtom(s->tmp.time_in_queue), - jtom(s->tmp.io_ticks[0]), - jtom(s->tmp.io_ticks[1]) + shared->tmp.ios[0], + shared->tmp.ios_merged[0], + shared->tmp.sectors[0], + jtom(shared->tmp.ticks[0]), + shared->tmp.ios[1], + shared->tmp.ios_merged[1], + shared->tmp.sectors[1], + jtom(shared->tmp.ticks[1]), + dm_stat_in_flight(shared), + jtom(shared->tmp.io_ticks_total), + jtom(shared->tmp.time_in_queue), + jtom(shared->tmp.io_ticks[0]), + jtom(shared->tmp.io_ticks[1]) ); if (unlikely(sz + 1 >= maxlen)) goto buffer_overflow; -- 1.7.1