From ae03477bda9181a9f73d058a5c57beb5a3f2828e Mon Sep 17 00:00:00 2001
From: Mike Snitzer <snitzer@redhat.com>
Date: Tue, 6 Aug 2013 08:21:55 -0400
Subject: [PATCH 14/14] dm stats: fix dm_stat* variable naming inconsistency

but I think ideally the following dm-stats.c variable renames would be
done:

 s/st/stats/
 s/s/shared/
 s/m/s/
---
 drivers/md/dm-stats.c |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
index d966f2b..b1a68e4 100644
--- a/drivers/md/dm-stats.c
+++ b/drivers/md/dm-stats.c
@@ -220,7 +220,7 @@ static int dm_stats_create(struct dm_stats *st, sector_t start, sector_t end,
 			   struct mapped_device *md)
 {
 	struct list_head *l;
-	struct dm_stat *s;
+	struct dm_stat *m;
 	sector_t n_entries;
 	size_t ni;
 	size_t shared_alloc_size;
@@ -250,31 +250,31 @@ static int dm_stats_create(struct dm_stats *st, sector_t start, sector_t end,
 	if (!check_shared_memory(shared_alloc_size + num_possible_cpus() * percpu_alloc_size))
 		return -ENOMEM;
 
-	s = kvzalloc(shared_alloc_size, NUMA_NO_NODE);
-	if (!s)
+	m = kvzalloc(shared_alloc_size, NUMA_NO_NODE);
+	if (!m)
 		return -ENOMEM;
 
-	s->n_entries = n_entries;
-	s->start = start;
-	s->end = end;
-	s->step = step;
-	s->shared_alloc_size = shared_alloc_size;
-	s->percpu_alloc_size = percpu_alloc_size;
+	m->n_entries = n_entries;
+	m->start = start;
+	m->end = end;
+	m->step = step;
+	m->shared_alloc_size = shared_alloc_size;
+	m->percpu_alloc_size = percpu_alloc_size;
 
-	s->program = kstrdup(program, GFP_KERNEL);
-	if (!s->program) {
+	m->program = kstrdup(program, GFP_KERNEL);
+	if (!m->program) {
 		r = -ENOMEM;
 		goto free_ret;
 	}
-	s->aux = kstrdup(aux, GFP_KERNEL);
-	if (!s->aux) {
+	m->aux = kstrdup(aux, GFP_KERNEL);
+	if (!m->aux) {
 		r = -ENOMEM;
 		goto free_ret;
 	}
 
 	for (ni = 0; ni < n_entries; ni++) {
-		atomic_set(&s->stat_shared[ni].in_flight[0], 0);
-		atomic_set(&s->stat_shared[ni].in_flight[1], 0);
+		atomic_set(&m->stat_shared[ni].in_flight[0], 0);
+		atomic_set(&m->stat_shared[ni].in_flight[1], 0);
 	}
 
 	for_each_possible_cpu(cpu) {
@@ -283,7 +283,7 @@ static int dm_stats_create(struct dm_stats *st, sector_t start, sector_t end,
 			r = -ENOMEM;
 			goto free_ret;
 		}
-		s->stat_percpu[cpu] = pc;
+		m->stat_percpu[cpu] = pc;
 	}
 
 	/*
@@ -296,23 +296,23 @@ static int dm_stats_create(struct dm_stats *st, sector_t start, sector_t end,
 	suspend_callback(md);
 
 	mutex_lock(&st->mutex);
-	s->id = 0;
+	m->id = 0;
 	list_for_each(l, &st->list) {
 		struct dm_stat *m = container_of(l, struct dm_stat, list_entry);
-		if (m->id < s->id)
+		if (m->id < m->id)
 			BUG();
-		if (m->id > s->id)
+		if (m->id > m->id)
 			break;
-		if (s->id == INT_MAX) {
+		if (m->id == INT_MAX) {
 			mutex_unlock(&st->mutex);
 			resume_callback(md);
 			r = -ENFILE;
 			goto free_ret;
 		}
-		s->id++;
+		m->id++;
 	}
-	ret_id = s->id;
-	list_add_tail_rcu(&s->list_entry, l);
+	ret_id = m->id;
+	list_add_tail_rcu(&m->list_entry, l);
 	mutex_unlock(&st->mutex);
 
 	resume_callback(md);
@@ -320,7 +320,7 @@ static int dm_stats_create(struct dm_stats *st, sector_t start, sector_t end,
 	return ret_id;
 
 free_ret:
-	dm_stat_free(&s->rcu_head);
+	dm_stat_free(&m->rcu_head);
 	return r;
 }
 
-- 
1.7.1