Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c7da06f authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Mike Snitzer
Browse files

dm persistent data: eliminate unnecessary return values 



dm_bm_unlock and dm_tm_unlock return an integer value but the returned
value is always 0.  The calling code sometimes checks the return value
and sometimes doesn't.

Eliminate these unnecessary return values and also the checks for them.

Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent dbba42d8

drivers/md/dm-cache-metadata.c

+6 −2
Original line number Diff line number Diff line
@@ -260,7 +260,9 @@ static int __superblock_all_zeroes(struct dm_block_manager *bm, bool *result) 
		}

	}



	return dm_bm_unlock(b);

	dm_bm_unlock(b);



	return 0;

}



static void __setup_mapping_info(struct dm_cache_metadata *cmd)
@@ -465,7 +467,9 @@ static int __open_metadata(struct dm_cache_metadata *cmd) 
	dm_disk_bitset_init(cmd->tm, &cmd->discard_info);

	sb_flags = le32_to_cpu(disk_super->flags);

	cmd->clean_when_opened = test_bit(CLEAN_SHUTDOWN, &sb_flags);

	return dm_bm_unlock(sblock);

	dm_bm_unlock(sblock);



	return 0;



bad:

	dm_bm_unlock(sblock);

drivers/md/dm-era-target.c

+7 −8
Original line number Diff line number Diff line
@@ -343,7 +343,9 @@ static int superblock_all_zeroes(struct dm_block_manager *bm, bool *result) 
		}

	}



	return dm_bm_unlock(b);

	dm_bm_unlock(b);



	return 0;

}



/*----------------------------------------------------------------*/
@@ -582,7 +584,9 @@ static int open_metadata(struct era_metadata *md) 
	md->metadata_snap = le64_to_cpu(disk->metadata_snap);

	md->archived_writesets = true;



	return dm_bm_unlock(sblock);

	dm_bm_unlock(sblock);



	return 0;



bad:

	dm_bm_unlock(sblock);
@@ -1046,12 +1050,7 @@ static int metadata_take_snap(struct era_metadata *md) 


	md->metadata_snap = dm_block_location(clone);



	r = dm_tm_unlock(md->tm, clone);

	if (r) {

		DMERR("%s: couldn't unlock clone", __func__);

		md->metadata_snap = SUPERBLOCK_LOCATION;

		return r;

	}

	dm_tm_unlock(md->tm, clone);



	return 0;

}

drivers/md/dm-thin-metadata.c

+12 −4
Original line number Diff line number Diff line
@@ -396,7 +396,9 @@ static int __superblock_all_zeroes(struct dm_block_manager *bm, int *result) 
		}

	}



	return dm_bm_unlock(b);

	dm_bm_unlock(b);



	return 0;

}



static void __setup_btree_details(struct dm_pool_metadata *pmd)
@@ -650,7 +652,9 @@ static int __open_metadata(struct dm_pool_metadata *pmd) 
	}



	__setup_btree_details(pmd);

	return dm_bm_unlock(sblock);

	dm_bm_unlock(sblock);



	return 0;



bad_cleanup_data_sm:

	dm_sm_destroy(pmd->data_sm);
@@ -1297,7 +1301,9 @@ static int __release_metadata_snap(struct dm_pool_metadata *pmd) 
	dm_btree_del(&pmd->details_info, le64_to_cpu(disk_super->device_details_root));

	dm_sm_dec_block(pmd->metadata_sm, held_root);



	return dm_tm_unlock(pmd->tm, copy);

	dm_tm_unlock(pmd->tm, copy);



	return 0;

}



int dm_pool_release_metadata_snap(struct dm_pool_metadata *pmd)
@@ -1327,7 +1333,9 @@ static int __get_metadata_snap(struct dm_pool_metadata *pmd, 
	disk_super = dm_block_data(sblock);

	*result = le64_to_cpu(disk_super->held_root);



	return dm_bm_unlock(sblock);

	dm_bm_unlock(sblock);



	return 0;

}



int dm_pool_get_metadata_snap(struct dm_pool_metadata *pmd,

drivers/md/persistent-data/dm-array.c

+2 −2
Original line number Diff line number Diff line
@@ -233,9 +233,9 @@ static int get_ablock(struct dm_array_info *info, dm_block_t b, 
/*

 * Unlocks an array block.

 */

static int unlock_ablock(struct dm_array_info *info, struct dm_block *block)

static void unlock_ablock(struct dm_array_info *info, struct dm_block *block)

{

	return dm_tm_unlock(info->btree_info.tm, block);

	dm_tm_unlock(info->btree_info.tm, block);

}



/*----------------------------------------------------------------*/

drivers/md/persistent-data/dm-block-manager.c

+1 −3
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ int dm_bm_write_lock_zero(struct dm_block_manager *bm, 
}

EXPORT_SYMBOL_GPL(dm_bm_write_lock_zero);



int dm_bm_unlock(struct dm_block *b)

void dm_bm_unlock(struct dm_block *b)

{

	struct buffer_aux *aux;

	aux = dm_bufio_get_aux_data(to_buffer(b));
@@ -590,8 +590,6 @@ int dm_bm_unlock(struct dm_block *b) 
		bl_up_read(&aux->lock);



	dm_bufio_release(to_buffer(b));



	return 0;

}

EXPORT_SYMBOL_GPL(dm_bm_unlock);