dm: avoid useless 'else' after 'break' or return'

Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>

diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
index e0e665e..4335828 100644 (file)
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
@@ -259,11 +259,11 @@ static int stripe_map_range(struct stripe_c *sc, struct bio *bio,
                        sc->stripe[target_stripe].physical_start;
                bio->bi_iter.bi_size = to_bytes(end - begin);
                return DM_MAPIO_REMAPPED;
-       } else {
-               /* The range doesn't map to the target stripe */
-               bio_endio(bio);
-               return DM_MAPIO_SUBMITTED;
        }
+
+       /* The range doesn't map to the target stripe */
+       bio_endio(bio);
+       return DM_MAPIO_SUBMITTED;
 }
 
 static int stripe_map(struct dm_target *ti, struct bio *bio)

diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
index 2b12e0e..fd464fb 100644 (file)
--- a/drivers/md/dm-thin-metadata.c
+++ b/drivers/md/dm-thin-metadata.c
@@ -1612,8 +1612,8 @@ static int __find_mapped_range(struct dm_thin_device *td,
                if (r) {
                        if (r == -ENODATA)
                                break;
-                       else
-                               return r;
+
+                       return r;
                }
 
                if ((lookup.block != pool_end) ||

diff --git a/drivers/md/dm-verity-target.c b/drivers/md/dm-verity-target.c
index 0f98140..ade83ef 100644 (file)
--- a/drivers/md/dm-verity-target.c
+++ b/drivers/md/dm-verity-target.c
@@ -110,23 +110,24 @@ static int verity_hash_update(struct dm_verity *v, struct ahash_request *req,
                sg_init_one(&sg, data, len);
                ahash_request_set_crypt(req, &sg, NULL, len);
                return crypto_wait_req(crypto_ahash_update(req), wait);
-       } else {
-               do {
-                       int r;
-                       size_t this_step = min_t(size_t, len, PAGE_SIZE - offset_in_page(data));
-
-                       flush_kernel_vmap_range((void *)data, this_step);
-                       sg_init_table(&sg, 1);
-                       sg_set_page(&sg, vmalloc_to_page(data), this_step, offset_in_page(data));
-                       ahash_request_set_crypt(req, &sg, NULL, this_step);
-                       r = crypto_wait_req(crypto_ahash_update(req), wait);
-                       if (unlikely(r))
-                               return r;
-                       data += this_step;
-                       len -= this_step;
-               } while (len);
-               return 0;
        }
+
+       do {
+               int r;
+               size_t this_step = min_t(size_t, len, PAGE_SIZE - offset_in_page(data));
+
+               flush_kernel_vmap_range((void *)data, this_step);
+               sg_init_table(&sg, 1);
+               sg_set_page(&sg, vmalloc_to_page(data), this_step, offset_in_page(data));
+               ahash_request_set_crypt(req, &sg, NULL, this_step);
+               r = crypto_wait_req(crypto_ahash_update(req), wait);
+               if (unlikely(r))
+                       return r;
+               data += this_step;
+               len -= this_step;
+       } while (len);
+
+       return 0;
 }
 
 /*

diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c
index 2dfa612..70a110a 100644 (file)
--- a/drivers/md/dm-writecache.c
+++ b/drivers/md/dm-writecache.c
@@ -623,15 +623,15 @@ static struct wc_entry *writecache_find_entry(struct dm_writecache *wc,
                if (unlikely(!node)) {
                        if (!(flags & WFE_RETURN_FOLLOWING))
                                return NULL;
-                       if (read_original_sector(wc, e) >= block) {
+                       if (read_original_sector(wc, e) >= block)
                                return e;
-                       } else {
-                               node = rb_next(&e->rb_node);
-                               if (unlikely(!node))
-                                       return NULL;
-                               e = container_of(node, struct wc_entry, rb_node);
-                               return e;
-                       }
+
+                       node = rb_next(&e->rb_node);
+                       if (unlikely(!node))
+                               return NULL;
+
+                       e = container_of(node, struct wc_entry, rb_node);
+                       return e;
                }
        }
 

diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c
index f4c6306..bb8b34f 100644 (file)
--- a/drivers/md/persistent-data/dm-btree.c
+++ b/drivers/md/persistent-data/dm-btree.c
@@ -1352,8 +1352,8 @@ static int find_key(struct ro_spine *s, dm_block_t block, bool find_highest,
                i = le32_to_cpu(ro_node(s)->header.nr_entries);
                if (!i)
                        return -ENODATA;
-               else
-                       i--;
+
+               i--;
 
                if (find_highest)
                        *result_key = le64_to_cpu(ro_node(s)->keys[i]);

diff --git a/drivers/md/persistent-data/dm-space-map-common.c b/drivers/md/persistent-data/dm-space-map-common.c
index e927ed8..591d1a4 100644 (file)
--- a/drivers/md/persistent-data/dm-space-map-common.c
+++ b/drivers/md/persistent-data/dm-space-map-common.c
@@ -793,13 +793,12 @@ static int __sm_ll_dec_overflow(struct ll_disk *ll, dm_block_t b,
        rc = le32_to_cpu(*v_ptr);
        *old_rc = rc;
 
-       if (rc == 3) {
+       if (rc == 3)
                return __sm_ll_del_overflow(ll, b, ic);
-       } else {
-               rc--;
-               *v_ptr = cpu_to_le32(rc);
-               return 0;
-       }
+
+       rc--;
+       *v_ptr = cpu_to_le32(rc);
+       return 0;
 }
 
 static int sm_ll_dec_overflow(struct ll_disk *ll, dm_block_t b,