1
0
Fork 0

dm block manager: remove an unused argument from dm_block_manager_create()

The 'cache_size' argument of dm_block_manager_create() has never been
used.  Remove it along with the definitions of the constants passed as
the 'cache_size' argument.

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
hifive-unleashed-5.1
Bart Van Assche 2017-04-27 10:11:20 -07:00 committed by Mike Snitzer
parent 23a6012489
commit 73cbca6a63
5 changed files with 1 additions and 9 deletions

View File

@ -27,8 +27,6 @@
#define MIN_CACHE_VERSION 1 #define MIN_CACHE_VERSION 1
#define MAX_CACHE_VERSION 2 #define MAX_CACHE_VERSION 2
#define CACHE_METADATA_CACHE_SIZE 64
/* /*
* 3 for btree insert + * 3 for btree insert +
* 2 for btree lookup used within space map * 2 for btree lookup used within space map
@ -535,7 +533,6 @@ static int __create_persistent_data_objects(struct dm_cache_metadata *cmd,
{ {
int r; int r;
cmd->bm = dm_block_manager_create(cmd->bdev, DM_CACHE_METADATA_BLOCK_SIZE << SECTOR_SHIFT, cmd->bm = dm_block_manager_create(cmd->bdev, DM_CACHE_METADATA_BLOCK_SIZE << SECTOR_SHIFT,
CACHE_METADATA_CACHE_SIZE,
CACHE_MAX_CONCURRENT_LOCKS); CACHE_MAX_CONCURRENT_LOCKS);
if (IS_ERR(cmd->bm)) { if (IS_ERR(cmd->bm)) {
DMERR("could not create block manager"); DMERR("could not create block manager");

View File

@ -254,7 +254,6 @@ static struct dm_block_validator sb_validator = {
* Low level metadata handling * Low level metadata handling
*--------------------------------------------------------------*/ *--------------------------------------------------------------*/
#define DM_ERA_METADATA_BLOCK_SIZE 4096 #define DM_ERA_METADATA_BLOCK_SIZE 4096
#define DM_ERA_METADATA_CACHE_SIZE 64
#define ERA_MAX_CONCURRENT_LOCKS 5 #define ERA_MAX_CONCURRENT_LOCKS 5
struct era_metadata { struct era_metadata {
@ -615,7 +614,6 @@ static int create_persistent_data_objects(struct era_metadata *md,
int r; int r;
md->bm = dm_block_manager_create(md->bdev, DM_ERA_METADATA_BLOCK_SIZE, md->bm = dm_block_manager_create(md->bdev, DM_ERA_METADATA_BLOCK_SIZE,
DM_ERA_METADATA_CACHE_SIZE,
ERA_MAX_CONCURRENT_LOCKS); ERA_MAX_CONCURRENT_LOCKS);
if (IS_ERR(md->bm)) { if (IS_ERR(md->bm)) {
DMERR("could not create block manager"); DMERR("could not create block manager");

View File

@ -77,7 +77,6 @@
#define THIN_SUPERBLOCK_MAGIC 27022010 #define THIN_SUPERBLOCK_MAGIC 27022010
#define THIN_SUPERBLOCK_LOCATION 0 #define THIN_SUPERBLOCK_LOCATION 0
#define THIN_VERSION 2 #define THIN_VERSION 2
#define THIN_METADATA_CACHE_SIZE 64
#define SECTOR_TO_BLOCK_SHIFT 3 #define SECTOR_TO_BLOCK_SHIFT 3
/* /*
@ -686,7 +685,6 @@ static int __create_persistent_data_objects(struct dm_pool_metadata *pmd, bool f
int r; int r;
pmd->bm = dm_block_manager_create(pmd->bdev, THIN_METADATA_BLOCK_SIZE << SECTOR_SHIFT, pmd->bm = dm_block_manager_create(pmd->bdev, THIN_METADATA_BLOCK_SIZE << SECTOR_SHIFT,
THIN_METADATA_CACHE_SIZE,
THIN_MAX_CONCURRENT_LOCKS); THIN_MAX_CONCURRENT_LOCKS);
if (IS_ERR(pmd->bm)) { if (IS_ERR(pmd->bm)) {
DMERR("could not create block manager"); DMERR("could not create block manager");

View File

@ -378,7 +378,6 @@ struct dm_block_manager {
struct dm_block_manager *dm_block_manager_create(struct block_device *bdev, struct dm_block_manager *dm_block_manager_create(struct block_device *bdev,
unsigned block_size, unsigned block_size,
unsigned cache_size,
unsigned max_held_per_thread) unsigned max_held_per_thread)
{ {
int r; int r;

View File

@ -33,7 +33,7 @@ void *dm_block_data(struct dm_block *b);
struct dm_block_manager; struct dm_block_manager;
struct dm_block_manager *dm_block_manager_create( struct dm_block_manager *dm_block_manager_create(
struct block_device *bdev, unsigned block_size, struct block_device *bdev, unsigned block_size,
unsigned cache_size, unsigned max_held_per_thread); unsigned max_held_per_thread);
void dm_block_manager_destroy(struct dm_block_manager *bm); void dm_block_manager_destroy(struct dm_block_manager *bm);
unsigned dm_bm_block_size(struct dm_block_manager *bm); unsigned dm_bm_block_size(struct dm_block_manager *bm);