From ab01fb42a9bec6dfc9b288d933d61bd0dfb6479a Mon Sep 17 00:00:00 2001 From: Mike Snitzer Date: Tue, 6 Aug 2013 15:27:31 -0400 Subject: [PATCH 17/19] dm stats: rename struct dm_stats variables from 'st' to 'stats' --- drivers/md/dm-stats.c | 88 ++++++++++++++++++++++++------------------------ 1 files changed, 44 insertions(+), 44 deletions(-) diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c index b1a68e4..28c21ea 100644 --- a/drivers/md/dm-stats.c +++ b/drivers/md/dm-stats.c @@ -173,27 +173,27 @@ static int dm_stat_in_flight(struct dm_stat_shared *s) return atomic_read(&s->in_flight[0]) + atomic_read(&s->in_flight[1]); } -void dm_stats_init_device(struct dm_stats *st) +void dm_stats_init_device(struct dm_stats *stats) { int cpu; - mutex_init(&st->mutex); - INIT_LIST_HEAD(&st->list); - st->last = alloc_percpu(struct dm_stats_last_position); + mutex_init(&stats->mutex); + INIT_LIST_HEAD(&stats->list); + stats->last = alloc_percpu(struct dm_stats_last_position); for_each_possible_cpu(cpu) { struct dm_stats_last_position *last; - last = per_cpu_ptr(st->last, cpu); + last = per_cpu_ptr(stats->last, cpu); last->last_sector = -1; last->last_rw = -1; } } -void dm_stats_exit_device(struct dm_stats *st) +void dm_stats_exit_device(struct dm_stats *stats) { size_t ni; - while (!list_empty(&st->list)) { - struct dm_stat *m = container_of(st->list.next, struct dm_stat, list_entry); + while (!list_empty(&stats->list)) { + 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]; @@ -210,10 +210,10 @@ void dm_stats_exit_device(struct dm_stats *st) } dm_stat_free(&m->rcu_head); } - free_percpu(st->last); + free_percpu(stats->last); } -static int dm_stats_create(struct dm_stats *st, sector_t start, sector_t end, +static int dm_stats_create(struct dm_stats *stats, sector_t start, sector_t end, sector_t step, const char *program, const char *aux, void (*suspend_callback)(struct mapped_device *), void (*resume_callback)(struct mapped_device *), @@ -295,16 +295,16 @@ static int dm_stats_create(struct dm_stats *st, sector_t start, sector_t end, */ suspend_callback(md); - mutex_lock(&st->mutex); + mutex_lock(&stats->mutex); m->id = 0; - list_for_each(l, &st->list) { + list_for_each(l, &stats->list) { struct dm_stat *m = container_of(l, struct dm_stat, list_entry); if (m->id < m->id) BUG(); if (m->id > m->id) break; if (m->id == INT_MAX) { - mutex_unlock(&st->mutex); + mutex_unlock(&stats->mutex); resume_callback(md); r = -ENFILE; goto free_ret; @@ -313,7 +313,7 @@ static int dm_stats_create(struct dm_stats *st, sector_t start, sector_t end, } ret_id = m->id; list_add_tail_rcu(&m->list_entry, l); - mutex_unlock(&st->mutex); + mutex_unlock(&stats->mutex); resume_callback(md); @@ -324,11 +324,11 @@ free_ret: return r; } -static struct dm_stat *__dm_stats_find(struct dm_stats *st, int id) +static struct dm_stat *__dm_stats_find(struct dm_stats *stats, int id) { struct dm_stat *m; - list_for_each_entry(m, &st->list, list_entry) { + list_for_each_entry(m, &stats->list, list_entry) { if (m->id > id) break; if (m->id == id) @@ -338,21 +338,21 @@ static struct dm_stat *__dm_stats_find(struct dm_stats *st, int id) return NULL; } -static int dm_stats_delete(struct dm_stats *st, int id) +static int dm_stats_delete(struct dm_stats *stats, int id) { struct dm_stat *m; int cpu; - mutex_lock(&st->mutex); + mutex_lock(&stats->mutex); - m = __dm_stats_find(st, id); + m = __dm_stats_find(stats, id); if (!m) { - mutex_unlock(&st->mutex); + mutex_unlock(&stats->mutex); return -ENOENT; } list_del_rcu(&m->list_entry); - mutex_unlock(&st->mutex); + mutex_unlock(&stats->mutex); /* * vfree can't be called from RCU callback @@ -371,14 +371,14 @@ do_sync_free: return 0; } -static int dm_stats_list(struct dm_stats *st, const char *program, +static int dm_stats_list(struct dm_stats *stats, const char *program, char *result, unsigned maxlen) { struct dm_stat *m; unsigned sz = 0; - mutex_lock(&st->mutex); - list_for_each_entry(m, &st->list, list_entry) { + mutex_lock(&stats->mutex); + list_for_each_entry(m, &stats->list, list_entry) { if (!program || !strcmp(program, m->program)) DMEMIT("%d: %llu-%llu %llu %s %s\n", m->id, (unsigned long long)m->start, @@ -387,7 +387,7 @@ static int dm_stats_list(struct dm_stats *st, const char *program, m->program, m->aux); } - mutex_unlock(&st->mutex); + mutex_unlock(&stats->mutex); return 1; } @@ -493,7 +493,7 @@ static void __dm_stat_bio(struct dm_stat *m, unsigned long bi_rw, } while (unlikely(todo != 0)); } -void dm_stats_bio(struct dm_stats *st, +void dm_stats_bio(struct dm_stats *stats, unsigned long bi_rw, sector_t bi_sector, unsigned bi_sectors, bool end, unsigned long duration, struct dm_stats_aux *aux) { @@ -511,7 +511,7 @@ void dm_stats_bio(struct dm_stats *st, * A race condition can at worst cause that the merged flag is * misrepresented, so we don't have to disable preempt here. */ - last = __this_cpu_ptr(st->last); + last = __this_cpu_ptr(stats->last); aux->merged = bi_sector == ACCESS_ONCE(last->last_sector) && (bi_rw & (REQ_WRITE | REQ_DISCARD)) == (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)); @@ -521,7 +521,7 @@ void dm_stats_bio(struct dm_stats *st, rcu_read_lock(); - list_for_each_entry_rcu(m, &st->list, list_entry) + list_for_each_entry_rcu(m, &stats->list, list_entry) __dm_stat_bio(m, bi_rw, bi_sector, end_sector, end, duration, aux); rcu_read_unlock(); @@ -585,21 +585,21 @@ static void __dm_stat_clear(struct dm_stat *m, size_t idx_start, size_t idx_end, } } -static int dm_stats_clear(struct dm_stats *st, int id) +static int dm_stats_clear(struct dm_stats *stats, int id) { struct dm_stat *m; - mutex_lock(&st->mutex); + mutex_lock(&stats->mutex); - m = __dm_stats_find(st, id); + m = __dm_stats_find(stats, id); if (!m) { - mutex_unlock(&st->mutex); + mutex_unlock(&stats->mutex); return -ENOENT; } __dm_stat_clear(m, 0, m->n_entries, true); - mutex_unlock(&st->mutex); + mutex_unlock(&stats->mutex); return 1; } @@ -624,7 +624,7 @@ static unsigned long long jtom(unsigned long long j) return result; } -static int dm_stats_print(struct dm_stats *st, int id, +static int dm_stats_print(struct dm_stats *stats, int id, size_t idx_start, size_t idx_len, bool clear, char *result, unsigned maxlen) { @@ -635,11 +635,11 @@ static int dm_stats_print(struct dm_stats *st, int id, size_t idx_end; struct dm_stat_shared *s; - mutex_lock(&st->mutex); + mutex_lock(&stats->mutex); - m = __dm_stats_find(st, id); + m = __dm_stats_find(stats, id); if (!m) { - mutex_unlock(&st->mutex); + mutex_unlock(&stats->mutex); return -ENOENT; } @@ -686,33 +686,33 @@ static int dm_stats_print(struct dm_stats *st, int id, __dm_stat_clear(m, idx_start, idx_end, false); buffer_overflow: - mutex_unlock(&st->mutex); + mutex_unlock(&stats->mutex); return 1; } -static int dm_stats_set_aux(struct dm_stats *st, int id, const char *aux) +static int dm_stats_set_aux(struct dm_stats *stats, int id, const char *aux) { struct dm_stat *m; - mutex_lock(&st->mutex); + mutex_lock(&stats->mutex); - m = __dm_stats_find(st, id); + m = __dm_stats_find(stats, id); if (!m) { - mutex_unlock(&st->mutex); + mutex_unlock(&stats->mutex); return -ENOENT; } aux = kstrdup(aux, GFP_KERNEL); if (!aux) { - mutex_unlock(&st->mutex); + mutex_unlock(&stats->mutex); return -ENOMEM; } kfree(m->aux); m->aux = aux; - mutex_unlock(&st->mutex); + mutex_unlock(&stats->mutex); return 0; } -- 1.7.1