mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-01 10:43:43 +00:00
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>
This commit is contained in:
parent
1c3fe2fa94
commit
b30f160714
@ -33,7 +33,7 @@
|
|||||||
static bool devices_handle_discard_safely;
|
static bool devices_handle_discard_safely;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The following flags are used by dm-raid.c to set up the array state.
|
* The following flags are used by dm-raid to set up the array state.
|
||||||
* They must be cleared before md_run is called.
|
* They must be cleared before md_run is called.
|
||||||
*/
|
*/
|
||||||
#define FirstUse 10 /* rdev flag */
|
#define FirstUse 10 /* rdev flag */
|
||||||
|
@ -105,6 +105,7 @@ EXPORT_SYMBOL_GPL(dm_per_bio_data);
|
|||||||
struct bio *dm_bio_from_per_bio_data(void *data, size_t data_size)
|
struct bio *dm_bio_from_per_bio_data(void *data, size_t data_size)
|
||||||
{
|
{
|
||||||
struct dm_io *io = (struct dm_io *)((char *)data + data_size);
|
struct dm_io *io = (struct dm_io *)((char *)data + data_size);
|
||||||
|
|
||||||
if (io->magic == DM_IO_MAGIC)
|
if (io->magic == DM_IO_MAGIC)
|
||||||
return (struct bio *)((char *)io + DM_IO_BIO_OFFSET);
|
return (struct bio *)((char *)io + DM_IO_BIO_OFFSET);
|
||||||
BUG_ON(io->magic != DM_TIO_MAGIC);
|
BUG_ON(io->magic != DM_TIO_MAGIC);
|
||||||
@ -128,6 +129,7 @@ static int swap_bios = DEFAULT_SWAP_BIOS;
|
|||||||
static int get_swap_bios(void)
|
static int get_swap_bios(void)
|
||||||
{
|
{
|
||||||
int latch = READ_ONCE(swap_bios);
|
int latch = READ_ONCE(swap_bios);
|
||||||
|
|
||||||
if (unlikely(latch <= 0))
|
if (unlikely(latch <= 0))
|
||||||
latch = DEFAULT_SWAP_BIOS;
|
latch = DEFAULT_SWAP_BIOS;
|
||||||
return latch;
|
return latch;
|
||||||
@ -1115,6 +1117,7 @@ static void clone_endio(struct bio *bio)
|
|||||||
|
|
||||||
if (endio) {
|
if (endio) {
|
||||||
int r = endio(ti, bio, &error);
|
int r = endio(ti, bio, &error);
|
||||||
|
|
||||||
switch (r) {
|
switch (r) {
|
||||||
case DM_ENDIO_REQUEUE:
|
case DM_ENDIO_REQUEUE:
|
||||||
if (static_branch_unlikely(&zoned_enabled)) {
|
if (static_branch_unlikely(&zoned_enabled)) {
|
||||||
@ -1403,6 +1406,7 @@ static void __map_bio(struct bio *clone)
|
|||||||
if (static_branch_unlikely(&swap_bios_enabled) &&
|
if (static_branch_unlikely(&swap_bios_enabled) &&
|
||||||
unlikely(swap_bios_limit(ti, clone))) {
|
unlikely(swap_bios_limit(ti, clone))) {
|
||||||
int latch = get_swap_bios();
|
int latch = get_swap_bios();
|
||||||
|
|
||||||
if (unlikely(latch != md->swap_bios))
|
if (unlikely(latch != md->swap_bios))
|
||||||
__set_swap_bios_limit(md, latch);
|
__set_swap_bios_limit(md, latch);
|
||||||
down(&md->swap_bios_semaphore);
|
down(&md->swap_bios_semaphore);
|
||||||
@ -2803,6 +2807,7 @@ static int __dm_resume(struct mapped_device *md, struct dm_table *map)
|
|||||||
{
|
{
|
||||||
if (map) {
|
if (map) {
|
||||||
int r = dm_table_resume_targets(map);
|
int r = dm_table_resume_targets(map);
|
||||||
|
|
||||||
if (r)
|
if (r)
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
@ -695,7 +695,7 @@ static int array_resize(struct dm_array_info *info, dm_block_t root,
|
|||||||
int dm_array_resize(struct dm_array_info *info, dm_block_t root,
|
int dm_array_resize(struct dm_array_info *info, dm_block_t root,
|
||||||
uint32_t old_size, uint32_t new_size,
|
uint32_t old_size, uint32_t new_size,
|
||||||
const void *value, dm_block_t *new_root)
|
const void *value, dm_block_t *new_root)
|
||||||
__dm_written_to_disk(value)
|
__dm_written_to_disk(value)
|
||||||
{
|
{
|
||||||
int r = array_resize(info, root, old_size, new_size, value, new_root);
|
int r = array_resize(info, root, old_size, new_size, value, new_root);
|
||||||
|
|
||||||
@ -846,7 +846,7 @@ static int array_set_value(struct dm_array_info *info, dm_block_t root,
|
|||||||
|
|
||||||
int dm_array_set_value(struct dm_array_info *info, dm_block_t root,
|
int dm_array_set_value(struct dm_array_info *info, dm_block_t root,
|
||||||
uint32_t index, const void *value, dm_block_t *new_root)
|
uint32_t index, const void *value, dm_block_t *new_root)
|
||||||
__dm_written_to_disk(value)
|
__dm_written_to_disk(value)
|
||||||
{
|
{
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
|
@ -1320,7 +1320,7 @@ static int insert(struct dm_btree_info *info, dm_block_t root,
|
|||||||
|
|
||||||
int dm_btree_insert(struct dm_btree_info *info, dm_block_t root,
|
int dm_btree_insert(struct dm_btree_info *info, dm_block_t root,
|
||||||
uint64_t *keys, void *value, dm_block_t *new_root)
|
uint64_t *keys, void *value, dm_block_t *new_root)
|
||||||
__dm_written_to_disk(value)
|
__dm_written_to_disk(value)
|
||||||
{
|
{
|
||||||
return insert(info, root, keys, value, new_root, NULL);
|
return insert(info, root, keys, value, new_root, NULL);
|
||||||
}
|
}
|
||||||
@ -1329,7 +1329,7 @@ EXPORT_SYMBOL_GPL(dm_btree_insert);
|
|||||||
int dm_btree_insert_notify(struct dm_btree_info *info, dm_block_t root,
|
int dm_btree_insert_notify(struct dm_btree_info *info, dm_block_t root,
|
||||||
uint64_t *keys, void *value, dm_block_t *new_root,
|
uint64_t *keys, void *value, dm_block_t *new_root,
|
||||||
int *inserted)
|
int *inserted)
|
||||||
__dm_written_to_disk(value)
|
__dm_written_to_disk(value)
|
||||||
{
|
{
|
||||||
return insert(info, root, keys, value, new_root, inserted);
|
return insert(info, root, keys, value, new_root, inserted);
|
||||||
}
|
}
|
||||||
|
@ -122,7 +122,7 @@ int dm_btree_lookup_next(struct dm_btree_info *info, dm_block_t root,
|
|||||||
*/
|
*/
|
||||||
int dm_btree_insert(struct dm_btree_info *info, dm_block_t root,
|
int dm_btree_insert(struct dm_btree_info *info, dm_block_t root,
|
||||||
uint64_t *keys, void *value, dm_block_t *new_root)
|
uint64_t *keys, void *value, dm_block_t *new_root)
|
||||||
__dm_written_to_disk(value);
|
__dm_written_to_disk(value);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* A variant of insert that indicates whether it actually inserted or just
|
* A variant of insert that indicates whether it actually inserted or just
|
||||||
|
Loading…
Reference in New Issue
Block a user