[dm-devel] [PATCH 2/7] dm-stats: rename functions

[Mikulas Patocka]

Rename function dm_kvzalloc to dm_stats_kvzalloc and dm_kvfree to
dm_stats_kvfree so that they don't clash with newly introduced and
exported functions.

Signed-off-by: Mikulas Patocka <mpatocka at redhat.com>

---
 drivers/md/dm-stats.c |   25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

Index: linux-4.1/drivers/md/dm-stats.c
===================================================================
--- linux-4.1.orig/drivers/md/dm-stats.c	2015-07-02 18:54:50.000000000 +0200
+++ linux-4.1/drivers/md/dm-stats.c	2015-07-02 19:03:26.000000000 +0200
@@ -139,7 +139,7 @@ static void free_shared_memory(size_t al
 	spin_unlock_irqrestore(&shared_memory_lock, flags);
 }
 
-static void *dm_kvzalloc(size_t alloc_size, int node)
+static void *dm_stats_kvzalloc(size_t alloc_size, int node)
 {
 	void *p;
 
@@ -160,17 +160,14 @@ static void *dm_kvzalloc(size_t alloc_si
 	return NULL;
 }
 
-static void dm_kvfree(void *ptr, size_t alloc_size)
+static void dm_stats_kvfree(void *ptr, size_t alloc_size)
 {
 	if (!ptr)
 		return;
 
 	free_shared_memory(alloc_size);
 
-	if (is_vmalloc_addr(ptr))
-		vfree(ptr);
-	else
-		kfree(ptr);
+	kvfree(ptr);
 }
 
 static void dm_stat_free(struct rcu_head *head)
@@ -181,11 +178,11 @@ static void dm_stat_free(struct rcu_head
 	kfree(s->program_id);
 	kfree(s->aux_data);
 	for_each_possible_cpu(cpu) {
-		dm_kvfree(s->stat_percpu[cpu][0].histogram, s->histogram_alloc_size);
-		dm_kvfree(s->stat_percpu[cpu], s->percpu_alloc_size);
+		dm_stats_kvfree(s->stat_percpu[cpu][0].histogram, s->histogram_alloc_size);
+		dm_stats_kvfree(s->stat_percpu[cpu], s->percpu_alloc_size);
 	}
-	dm_kvfree(s->stat_shared[0].tmp.histogram, s->histogram_alloc_size);
-	dm_kvfree(s, s->shared_alloc_size);
+	dm_stats_kvfree(s->stat_shared[0].tmp.histogram, s->histogram_alloc_size);
+	dm_stats_kvfree(s, s->shared_alloc_size);
 }
 
 static int dm_stat_in_flight(struct dm_stat_shared *shared)
@@ -282,7 +279,7 @@ static int dm_stats_create(struct dm_sta
 	if (!check_shared_memory(shared_alloc_size + histogram_alloc_size + num_possible_cpus() * (percpu_alloc_size + histogram_alloc_size)))
 		return -ENOMEM;
 
-	s = dm_kvzalloc(shared_alloc_size, NUMA_NO_NODE);
+	s = dm_stats_kvzalloc(shared_alloc_size, NUMA_NO_NODE);
 	if (!s)
 		return -ENOMEM;
 
@@ -320,7 +317,7 @@ static int dm_stats_create(struct dm_sta
 
 	if (s->n_histogram_entries) {
 		unsigned long long *hi;
-		hi = dm_kvzalloc(s->histogram_alloc_size, NUMA_NO_NODE);
+		hi = dm_stats_kvzalloc(s->histogram_alloc_size, NUMA_NO_NODE);
 		if (!hi) {
 			r = -ENOMEM;
 			goto out;
@@ -332,7 +329,7 @@ static int dm_stats_create(struct dm_sta
 	}
 
 	for_each_possible_cpu(cpu) {
-		p = dm_kvzalloc(percpu_alloc_size, cpu_to_node(cpu));
+		p = dm_stats_kvzalloc(percpu_alloc_size, cpu_to_node(cpu));
 		if (!p) {
 			r = -ENOMEM;
 			goto out;
@@ -340,7 +337,7 @@ static int dm_stats_create(struct dm_sta
 		s->stat_percpu[cpu] = p;
 		if (s->n_histogram_entries) {
 			unsigned long long *hi;
-			hi = dm_kvzalloc(s->histogram_alloc_size, cpu_to_node(cpu));
+			hi = dm_stats_kvzalloc(s->histogram_alloc_size, cpu_to_node(cpu));
 			if (!hi) {
 				r = -ENOMEM;
 				goto out;