From 6dd22f3e5abb0a5b9ef1a605ec11d40b8cbd6d0c Mon Sep 17 00:00:00 2001 From: Mike Snitzer Date: Mon, 5 Aug 2013 18:53:27 -0400 Subject: [PATCH 10/11] dm stats: silence checkpatch errors --- drivers/md/dm-ioctl.c | 7 +++---- drivers/md/dm-stats.c | 10 +++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index 606dab7..d819e9a 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c @@ -1465,12 +1465,11 @@ static int message_for_md(struct mapped_device *md, unsigned argc, char **argv, { int r; - if ((r = dm_stats_message(md, argc, argv, result, maxlen)) < 2) + r = dm_stats_message(md, argc, argv, result, maxlen); + if (r < 2) return r; - else - return 2; - return r; + return 2; } /* diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c index 61f5739..1bc86fb 100644 --- a/drivers/md/dm-stats.c +++ b/drivers/md/dm-stats.c @@ -59,12 +59,12 @@ struct dm_stats_last_position { * exhaust 1/4 of all memory or 1/2 of vmalloc space. */ -#define DM_STATS_MEMORY_RATIO 1 / 4 -#define DM_STATS_VMALLOC_RATIO 1 / 2 +#define DM_STATS_MEMORY_RATIO (1 / 4) +#define DM_STATS_VMALLOC_RATIO (1 / 2) static DEFINE_SPINLOCK(shared_memory_lock); -static size_t shared_memory_amount = 0; +static size_t shared_memory_amount; static bool _check_shared_memory(size_t alloc_size) { @@ -567,7 +567,7 @@ static void __dm_stat_clear(struct dm_stat *m, size_t idx_start, size_t idx_end, for (x = idx_start; x < idx_end; x++) { s = &m->stat_shared[x]; if (init_tmp_percpu_totals) - __dm_stat_init_temporary_percpu_totals(s, m ,x); + __dm_stat_init_temporary_percpu_totals(s, m, x); local_irq_disable(); p = &m->stat_percpu[smp_processor_id()][x]; p->sectors[0] -= s->tmp.sectors[0]; @@ -597,7 +597,7 @@ static int dm_stats_clear(struct dm_stats *st, int id) mutex_unlock(&st->mutex); return -ENOENT; } - + __dm_stat_clear(m, 0, m->n_entries, true); mutex_unlock(&st->mutex); -- 1.7.1