From d2b64ed31b079daacea8595abc5694e8cf8e5352 Mon Sep 17 00:00:00 2001
From: Mike Snitzer <snitzer@redhat.com>
Date: Mon, 5 Aug 2013 15:54:28 -0400
Subject: [PATCH 3/9] dm stats: silence a few nits from checkpatch

---
 drivers/md/dm-ioctl.c |   15 +++++++--------
 drivers/md/dm-stats.c |   23 ++++++++++++-----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index a405529..de4ad28 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -1631,21 +1631,20 @@ static int message_for_md(struct mapped_device *md, unsigned argc, char **argv,
 {
 	int r;
 
-	if (!strcasecmp(argv[0], "@stats_create")) {
+	if (!strcasecmp(argv[0], "@stats_create"))
 		r = message_stats_create(md, argc, argv, result, maxlen);
-	} else if (!strcasecmp(argv[0], "@stats_delete")) {
+	else if (!strcasecmp(argv[0], "@stats_delete"))
 		r = message_stats_delete(md, argc, argv);
-	} else if (!strcasecmp(argv[0], "@stats_list")) {
+	else if (!strcasecmp(argv[0], "@stats_list"))
 		r = message_stats_list(md, argc, argv, result, maxlen);
-	} else if (!strcasecmp(argv[0], "@stats_print")) {
+	else if (!strcasecmp(argv[0], "@stats_print"))
 		r = message_stats_print(md, argc, argv, false, result, maxlen);
-	} else if (!strcasecmp(argv[0], "@stats_print_clear")) {
+	else if (!strcasecmp(argv[0], "@stats_print_clear"))
 		r = message_stats_print(md, argc, argv, true, result, maxlen);
-	} else if (!strcasecmp(argv[0], "@stats_set_aux")) {
+	else if (!strcasecmp(argv[0], "@stats_set_aux"))
 		r = message_stats_set_aux(md, argc, argv);
-	} else {
+	else
 		return 2;
-	}
 
 	if (r == -EOPNOTSUPP)
 		DMWARN("Statistics are only supported for bio based devices");
diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
index d043aed..e4e397c 100644
--- a/drivers/md/dm-stats.c
+++ b/drivers/md/dm-stats.c
@@ -11,6 +11,8 @@
 
 #include "dm-stats.h"
 
+#define DM_MSG_PREFIX "stats"
+
 static volatile int dm_stat_need_rcu_barrier;
 
 struct dm_stat_percpu {
@@ -191,16 +193,15 @@ void dm_stats_exit_device(struct dm_stats *st)
 		list_del(&m->list_entry);
 		for (ni = 0; ni < m->n_entries; ni++) {
 			struct dm_stat_shared *s = &m->stat_shared[ni];
-			if (dm_stat_in_flight(s)) {
-				printk(KERN_CRIT "dm-stats: 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])
-				);
-				BUG();
+			if (WARN_ON(dm_stat_in_flight(s))) {
+				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]));
 			}
 		}
 		dm_stat_free(&m->rcu_head);
@@ -571,7 +572,7 @@ int dm_stats_print(struct dm_stats *st, int id,
 		dm_stat_round(s, p);
 		local_irq_enable();
 
-		memset(&s->tmp, 0, sizeof s->tmp);
+		memset(&s->tmp, 0, sizeof(s->tmp));
 		for_each_possible_cpu(cpu) {
 			p = &m->stat_percpu[cpu][x];
 			s->tmp.sectors[0] += p->sectors[0];
-- 
1.7.1