Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

dm thin: add braces around conditional code that spans lines

Signed-off-by: Mike Snitzer <snitzer@kernel.org>

+12 -8
+12 -8
drivers/md/dm-thin.c
··· 453 453 cell_prealloc = dm_bio_prison_alloc_cell(pool->prison, GFP_NOIO); 454 454 455 455 r = dm_bio_detain(pool->prison, key, bio, cell_prealloc, cell_result); 456 - if (r) 456 + if (r) { 457 457 /* 458 458 * We reused an old cell; we can get rid of 459 459 * the new one. 460 460 */ 461 461 dm_bio_prison_free_cell(pool->prison, cell_prealloc); 462 + } 462 463 463 464 return r; 464 465 } ··· 708 707 (void) sector_div(e, pool->sectors_per_block); 709 708 } 710 709 711 - if (e < b) 710 + if (e < b) { 712 711 /* Can happen if the bio is within a single block. */ 713 712 e = b; 713 + } 714 714 715 715 *begin = b; 716 716 *end = e; ··· 723 721 sector_t bi_sector = bio->bi_iter.bi_sector; 724 722 725 723 bio_set_dev(bio, tc->pool_dev->bdev); 726 - if (block_size_is_power_of_two(pool)) 724 + if (block_size_is_power_of_two(pool)) { 727 725 bio->bi_iter.bi_sector = 728 726 (block << pool->sectors_per_block_shift) | 729 727 (bi_sector & (pool->sectors_per_block - 1)); 730 - else 728 + } else { 731 729 bio->bi_iter.bi_sector = (block * pool->sectors_per_block) + 732 730 sector_div(bi_sector, pool->sectors_per_block); 731 + } 733 732 } 734 733 735 734 static void remap_to_origin(struct thin_c *tc, struct bio *bio) ··· 1404 1401 if (pool->pf.zero_new_blocks) { 1405 1402 if (io_overwrites_block(pool, bio)) 1406 1403 remap_and_issue_overwrite(tc, bio, data_block, m); 1407 - else 1404 + else { 1408 1405 ll_zero(tc, m, data_block * pool->sectors_per_block, 1409 1406 (data_block + 1) * pool->sectors_per_block); 1407 + } 1410 1408 } else 1411 1409 process_prepared_mapping(m); 1412 1410 } ··· 1420 1416 sector_t virt_block_begin = virt_block * pool->sectors_per_block; 1421 1417 sector_t virt_block_end = (virt_block + 1) * pool->sectors_per_block; 1422 1418 1423 - if (virt_block_end <= tc->origin_size) 1419 + if (virt_block_end <= tc->origin_size) { 1424 1420 schedule_copy(tc, virt_block, tc->origin_dev, 1425 1421 virt_block, data_dest, cell, bio, 1426 1422 pool->sectors_per_block); 1427 1423 1428 - else if (virt_block_begin < tc->origin_size) 1424 + } else if (virt_block_begin < tc->origin_size) { 1429 1425 schedule_copy(tc, virt_block, tc->origin_dev, 1430 1426 virt_block, data_dest, cell, bio, 1431 1427 tc->origin_size - virt_block_begin); 1432 1428 1433 - else 1429 + } else 1434 1430 schedule_zero(tc, virt_block, data_dest, cell, bio); 1435 1431 } 1436 1432