dm: address indent/space issues

[ Upstream commit 255e2646496fcbf836a3dfe1b535692f09f11b45 ]

Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Stable-dep-of: b4d78cfeb304 ("dm-integrity: align the outgoing bio in integrity_recheck")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/md/dm-cache-policy.h b/drivers/md/dm-cache-policy.h
index 6ba3e9c91af531775bb0f2159a8651fb60bf3441..8bc21d54884e9777eefca6918464988bf5d64388 100644 (file)
--- a/drivers/md/dm-cache-policy.h
+++ b/drivers/md/dm-cache-policy.h
@@ -75,7 +75,7 @@ struct dm_cache_policy {
         * background work.
         */
        int (*get_background_work)(struct dm_cache_policy *p, bool idle,
-                                  struct policy_work **result);
+                                  struct policy_work **result);
 
        /*
         * You must pass in the same work pointer that you were given, not

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index e8c534b5870ace6fc9079d7735b8ea9902889690..25e51dc6e55985705c258a334ba9dee087c797d4 100644 (file)
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -2535,7 +2535,7 @@ static int crypt_set_keyring_key(struct crypt_config *cc, const char *key_string
                type = &key_type_encrypted;
                set_key = set_key_encrypted;
        } else if (IS_ENABLED(CONFIG_TRUSTED_KEYS) &&
-                  !strncmp(key_string, "trusted:", key_desc - key_string + 1)) {
+                  !strncmp(key_string, "trusted:", key_desc - key_string + 1)) {
                type = &key_type_trusted;
                set_key = set_key_trusted;
        } else {

diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
index e1bf91faa462bde5072b912d989c7f388a659601..94382e43ea50617cba5b46d181f8fb2454739c16 100644 (file)
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@ -2367,7 +2367,6 @@ offload_to_thread:
                else
 skip_check:
                        dec_in_flight(dio);
-
        } else {
                INIT_WORK(&dio->work, integrity_metadata);
                queue_work(ic->metadata_wq, &dio->work);
@@ -4151,7 +4150,7 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned int argc, char **argv
                } else if (sscanf(opt_string, "block_size:%u%c", &val, &dummy) == 1) {
                        if (val < 1 << SECTOR_SHIFT ||
                            val > MAX_SECTORS_PER_BLOCK << SECTOR_SHIFT ||
-                           (val & (val -1))) {
+                           (val & (val - 1))) {
                                r = -EINVAL;
                                ti->error = "Invalid block_size argument";
                                goto bad;
@@ -4477,7 +4476,7 @@ try_smaller_buffer:
        if (ic->internal_hash) {
                size_t recalc_tags_size;
                ic->recalc_wq = alloc_workqueue("dm-integrity-recalc", WQ_MEM_RECLAIM, 1);
-               if (!ic->recalc_wq ) {
+               if (!ic->recalc_wq) {
                        ti->error = "Cannot allocate workqueue";
                        r = -ENOMEM;
                        goto bad;

diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c
index 05141eea18d3cfe53a6fe986de3ba5f043f82709..b7dd5a0cd58ba774cdf895680c045b358ebbaa20 100644 (file)
--- a/drivers/md/dm-log.c
+++ b/drivers/md/dm-log.c
@@ -756,8 +756,8 @@ static void core_set_region_sync(struct dm_dirty_log *log, region_t region,
        log_clear_bit(lc, lc->recovering_bits, region);
        if (in_sync) {
                log_set_bit(lc, lc->sync_bits, region);
-                lc->sync_count++;
-        } else if (log_test_bit(lc->sync_bits, region)) {
+               lc->sync_count++;
+       } else if (log_test_bit(lc->sync_bits, region)) {
                lc->sync_count--;
                log_clear_bit(lc, lc->sync_bits, region);
        }
@@ -765,9 +765,9 @@ static void core_set_region_sync(struct dm_dirty_log *log, region_t region,
 
 static region_t core_get_sync_count(struct dm_dirty_log *log)
 {
-        struct log_c *lc = (struct log_c *) log->context;
+       struct log_c *lc = (struct log_c *) log->context;
 
-        return lc->sync_count;
+       return lc->sync_count;
 }
 
 #define        DMEMIT_SYNC \

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 7fbce214e00f57e6b94b2f55541597f9029ba022..bf833ca880bc1aa1303a8a6a02ad6f2ef086bee2 100644 (file)
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -362,8 +362,8 @@ static struct {
        const int mode;
        const char *param;
 } _raid456_journal_mode[] = {
-       { R5C_JOURNAL_MODE_WRITE_THROUGH , "writethrough" },
-       { R5C_JOURNAL_MODE_WRITE_BACK    , "writeback" }
+       { R5C_JOURNAL_MODE_WRITE_THROUGH, "writethrough" },
+       { R5C_JOURNAL_MODE_WRITE_BACK,    "writeback" }
 };
 
 /* Return MD raid4/5/6 journal mode for dm @journal_mode one */
@@ -1114,7 +1114,7 @@ too_many:
  *    [stripe_cache <sectors>]         Stripe cache size for higher RAIDs
  *    [region_size <sectors>]          Defines granularity of bitmap
  *    [journal_dev <dev>]              raid4/5/6 journaling deviice
- *                                     (i.e. write hole closing log)
+ *                                     (i.e. write hole closing log)
  *
  * RAID10-only options:
  *    [raid10_copies <# copies>]       Number of copies.  (Default: 2)
@@ -3999,7 +3999,7 @@ static int raid_preresume(struct dm_target *ti)
        }
 
        /* Resize bitmap to adjust to changed region size (aka MD bitmap chunksize) or grown device size */
-        if (test_bit(RT_FLAG_RS_BITMAP_LOADED, &rs->runtime_flags) && mddev->bitmap &&
+       if (test_bit(RT_FLAG_RS_BITMAP_LOADED, &rs->runtime_flags) && mddev->bitmap &&
            (test_bit(RT_FLAG_RS_GROW, &rs->runtime_flags) ||
             (rs->requested_bitmap_chunk_sectors &&
               mddev->bitmap_info.chunksize != to_bytes(rs->requested_bitmap_chunk_sectors)))) {

diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index c38e63706d91128559d597fcadaaf05b167f1593..2327645fc0648205d16e4319a292c0a153f6627e 100644 (file)
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -902,7 +902,7 @@ static struct mirror_set *alloc_context(unsigned int nr_mirrors,
        if (IS_ERR(ms->io_client)) {
                ti->error = "Error creating dm_io client";
                kfree(ms);
-               return NULL;
+               return NULL;
        }
 
        ms->rh = dm_region_hash_create(ms, dispatch_bios, wakeup_mirrord,

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index e0367a672eabf876b0f2b1d55a66b4a0d91acb5f..aabb2435070b8e6cf279a5e959867f3ed42f601a 100644 (file)
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -72,7 +72,7 @@ static sector_t high(struct dm_table *t, unsigned int l, unsigned int n)
                n = get_child(n, CHILDREN_PER_NODE - 1);
 
        if (n >= t->counts[l])
-               return (sector_t) - 1;
+               return (sector_t) -1;
 
        return get_node(t, l, n)[KEYS_PER_NODE - 1];
 }
@@ -1533,7 +1533,7 @@ static bool dm_table_any_dev_attr(struct dm_table *t,
                if (ti->type->iterate_devices &&
                    ti->type->iterate_devices(ti, func, data))
                        return true;
-        }
+       }
 
        return false;
 }

diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
index 601f9e4e6234f06b0201feb229916df3d177ae4e..f24d89af7c5f0e572324f75cda7a26a4fa8a13be 100644 (file)
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -1179,9 +1179,9 @@ static void process_prepared_discard_passdown_pt1(struct dm_thin_new_mapping *m)
        discard_parent = bio_alloc(NULL, 1, 0, GFP_NOIO);
        discard_parent->bi_end_io = passdown_endio;
        discard_parent->bi_private = m;
-       if (m->maybe_shared)
-               passdown_double_checking_shared_status(m, discard_parent);
-       else {
+       if (m->maybe_shared)
+               passdown_double_checking_shared_status(m, discard_parent);
+       else {
                struct discard_op op;
 
                begin_discard(&op, tc, discard_parent);

diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c
index c6ff43a8f0b25b7618d3e212cecf4c0a601a04a6..a705e24d3e2b6ebefa5f781d927cbe36b5009b14 100644 (file)
--- a/drivers/md/dm-writecache.c
+++ b/drivers/md/dm-writecache.c
@@ -531,7 +531,7 @@ static void ssd_commit_flushed(struct dm_writecache *wc, bool wait_for_ios)
                req.notify.context = &endio;
 
                /* writing via async dm-io (implied by notify.fn above) won't return an error */
-               (void) dm_io(&req, 1, &region, NULL);
+               (void) dm_io(&req, 1, &region, NULL);
                i = j;
        }
 

diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c
index 1cc783d7030d84d3a94812c29d885dd357e337a8..18d949d63543bea80f986d8eb86ce304a9243413 100644 (file)
--- a/drivers/md/persistent-data/dm-btree.c
+++ b/drivers/md/persistent-data/dm-btree.c
@@ -726,7 +726,7 @@ static int shadow_child(struct dm_btree_info *info, struct dm_btree_value_type *
  * nodes, so saves metadata space.
  */
 static int split_two_into_three(struct shadow_spine *s, unsigned int parent_index,
-                                struct dm_btree_value_type *vt, uint64_t key)
+                               struct dm_btree_value_type *vt, uint64_t key)
 {
        int r;
        unsigned int middle_index;
@@ -781,7 +781,7 @@ static int split_two_into_three(struct shadow_spine *s, unsigned int parent_inde
                if (shadow_current(s) != right)
                        unlock_block(s->info, right);
 
-               return r;
+               return r;
        }
 
 
@@ -1216,7 +1216,7 @@ int btree_get_overwrite_leaf(struct dm_btree_info *info, dm_block_t root,
 static bool need_insert(struct btree_node *node, uint64_t *keys,
                        unsigned int level, unsigned int index)
 {
-        return ((index >= le32_to_cpu(node->header.nr_entries)) ||
+       return ((index >= le32_to_cpu(node->header.nr_entries)) ||
                (le64_to_cpu(node->keys[index]) != keys[level]));
 }
 

diff --git a/drivers/md/persistent-data/dm-space-map-common.c b/drivers/md/persistent-data/dm-space-map-common.c
index af800efed9f3ce99668bbb45448fcb664500d2e7..4833a3998c1d979b0496db53985827f755837ed7 100644 (file)
--- a/drivers/md/persistent-data/dm-space-map-common.c
+++ b/drivers/md/persistent-data/dm-space-map-common.c
@@ -390,7 +390,7 @@ int sm_ll_find_free_block(struct ll_disk *ll, dm_block_t begin,
 }
 
 int sm_ll_find_common_free_block(struct ll_disk *old_ll, struct ll_disk *new_ll,
-                                dm_block_t begin, dm_block_t end, dm_block_t *b)
+                                dm_block_t begin, dm_block_t end, dm_block_t *b)
 {
        int r;
        uint32_t count;

diff --git a/drivers/md/persistent-data/dm-space-map-common.h b/drivers/md/persistent-data/dm-space-map-common.h
index 706ceb85d68006d0e6d968d2841b5844d051d29f..63d9a72e3265c23af2ec3da61c6d447133d999c3 100644 (file)
--- a/drivers/md/persistent-data/dm-space-map-common.h
+++ b/drivers/md/persistent-data/dm-space-map-common.h
@@ -120,7 +120,7 @@ int sm_ll_lookup(struct ll_disk *ll, dm_block_t b, uint32_t *result);
 int sm_ll_find_free_block(struct ll_disk *ll, dm_block_t begin,
                          dm_block_t end, dm_block_t *result);
 int sm_ll_find_common_free_block(struct ll_disk *old_ll, struct ll_disk *new_ll,
-                                dm_block_t begin, dm_block_t end, dm_block_t *result);
+                                dm_block_t begin, dm_block_t end, dm_block_t *result);
 
 /*
  * The next three functions return (via nr_allocations) the net number of