mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-13 23:24:05 +08:00
dm: avoid useless 'else' after 'break' or return'
Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com> Signed-off-by: Mike Snitzer <snitzer@kernel.org>
This commit is contained in:
parent
ae99111ecf
commit
1c3fe2fa94
@ -259,12 +259,12 @@ 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;
|
||||
}
|
||||
}
|
||||
|
||||
static int stripe_map(struct dm_target *ti, struct bio *bio)
|
||||
{
|
||||
|
@ -1612,7 +1612,7 @@ static int __find_mapped_range(struct dm_thin_device *td,
|
||||
if (r) {
|
||||
if (r == -ENODATA)
|
||||
break;
|
||||
else
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
|
@ -110,7 +110,8 @@ 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));
|
||||
@ -125,9 +126,9 @@ static int verity_hash_update(struct dm_verity *v, struct ahash_request *req,
|
||||
data += this_step;
|
||||
len -= this_step;
|
||||
} while (len);
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Wrapper for crypto_ahash_init, which handles verity salting.
|
||||
|
@ -623,17 +623,17 @@ 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
while (1) {
|
||||
struct wc_entry *e2;
|
||||
|
@ -1352,7 +1352,7 @@ 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--;
|
||||
|
||||
if (find_highest)
|
||||
|
@ -793,14 +793,13 @@ 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;
|
||||
}
|
||||
}
|
||||
|
||||
static int sm_ll_dec_overflow(struct ll_disk *ll, dm_block_t b,
|
||||
struct inc_context *ic, uint32_t *old_rc)
|
||||
|
Loading…
Reference in New Issue
Block a user