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

dm: add missing blank line after declarations/fix those

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

authored by

Heinz Mauelshagen and committed by
Mike Snitzer b30f1607 1c3fe2fa

+11 -6
+1 -1
drivers/md/dm-raid.c
··· 33 33 static bool devices_handle_discard_safely; 34 34 35 35 /* 36 - * The following flags are used by dm-raid.c to set up the array state. 36 + * The following flags are used by dm-raid to set up the array state. 37 37 * They must be cleared before md_run is called. 38 38 */ 39 39 #define FirstUse 10 /* rdev flag */
+5
drivers/md/dm.c
··· 105 105 struct bio *dm_bio_from_per_bio_data(void *data, size_t data_size) 106 106 { 107 107 struct dm_io *io = (struct dm_io *)((char *)data + data_size); 108 + 108 109 if (io->magic == DM_IO_MAGIC) 109 110 return (struct bio *)((char *)io + DM_IO_BIO_OFFSET); 110 111 BUG_ON(io->magic != DM_TIO_MAGIC); ··· 129 128 static int get_swap_bios(void) 130 129 { 131 130 int latch = READ_ONCE(swap_bios); 131 + 132 132 if (unlikely(latch <= 0)) 133 133 latch = DEFAULT_SWAP_BIOS; 134 134 return latch; ··· 1117 1115 1118 1116 if (endio) { 1119 1117 int r = endio(ti, bio, &error); 1118 + 1120 1119 switch (r) { 1121 1120 case DM_ENDIO_REQUEUE: 1122 1121 if (static_branch_unlikely(&zoned_enabled)) { ··· 1406 1403 if (static_branch_unlikely(&swap_bios_enabled) && 1407 1404 unlikely(swap_bios_limit(ti, clone))) { 1408 1405 int latch = get_swap_bios(); 1406 + 1409 1407 if (unlikely(latch != md->swap_bios)) 1410 1408 __set_swap_bios_limit(md, latch); 1411 1409 down(&md->swap_bios_semaphore); ··· 2807 2803 { 2808 2804 if (map) { 2809 2805 int r = dm_table_resume_targets(map); 2806 + 2810 2807 if (r) 2811 2808 return r; 2812 2809 }
+2 -2
drivers/md/persistent-data/dm-array.c
··· 695 695 int dm_array_resize(struct dm_array_info *info, dm_block_t root, 696 696 uint32_t old_size, uint32_t new_size, 697 697 const void *value, dm_block_t *new_root) 698 - __dm_written_to_disk(value) 698 + __dm_written_to_disk(value) 699 699 { 700 700 int r = array_resize(info, root, old_size, new_size, value, new_root); 701 701 ··· 846 846 847 847 int dm_array_set_value(struct dm_array_info *info, dm_block_t root, 848 848 uint32_t index, const void *value, dm_block_t *new_root) 849 - __dm_written_to_disk(value) 849 + __dm_written_to_disk(value) 850 850 { 851 851 int r; 852 852
+2 -2
drivers/md/persistent-data/dm-btree.c
··· 1320 1320 1321 1321 int dm_btree_insert(struct dm_btree_info *info, dm_block_t root, 1322 1322 uint64_t *keys, void *value, dm_block_t *new_root) 1323 - __dm_written_to_disk(value) 1323 + __dm_written_to_disk(value) 1324 1324 { 1325 1325 return insert(info, root, keys, value, new_root, NULL); 1326 1326 } ··· 1329 1329 int dm_btree_insert_notify(struct dm_btree_info *info, dm_block_t root, 1330 1330 uint64_t *keys, void *value, dm_block_t *new_root, 1331 1331 int *inserted) 1332 - __dm_written_to_disk(value) 1332 + __dm_written_to_disk(value) 1333 1333 { 1334 1334 return insert(info, root, keys, value, new_root, inserted); 1335 1335 }
+1 -1
drivers/md/persistent-data/dm-btree.h
··· 122 122 */ 123 123 int dm_btree_insert(struct dm_btree_info *info, dm_block_t root, 124 124 uint64_t *keys, void *value, dm_block_t *new_root) 125 - __dm_written_to_disk(value); 125 + __dm_written_to_disk(value); 126 126 127 127 /* 128 128 * A variant of insert that indicates whether it actually inserted or just