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

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

kernel os linux

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>

authored by

Bart Van Assche and committed by

Mike Snitzer 9 years ago 73cbca6a 23a60124

+1 -9

5 changed files

expand all

drivers

dm-cache-metadata.c

dm-era-target.c

dm-thin-metadata.c

persistent-data

dm-block-manager.c

dm-block-manager.h

-3

drivers/md/dm-cache-metadata.c

··· 27 27 #define MIN_CACHE_VERSION 1 28 28 #define MAX_CACHE_VERSION 2 29 29 30 - #define CACHE_METADATA_CACHE_SIZE 64 31 - 32 30 /* 33 31 * 3 for btree insert + 34 32 * 2 for btree lookup used within space map ··· 533 535 { 534 536 int r; 535 537 cmd->bm = dm_block_manager_create(cmd->bdev, DM_CACHE_METADATA_BLOCK_SIZE << SECTOR_SHIFT, 536 - CACHE_METADATA_CACHE_SIZE, 537 538 CACHE_MAX_CONCURRENT_LOCKS); 538 539 if (IS_ERR(cmd->bm)) { 539 540 DMERR("could not create block manager");

-2

drivers/md/dm-era-target.c

··· 254 254 * Low level metadata handling 255 255 *--------------------------------------------------------------*/ 256 256 #define DM_ERA_METADATA_BLOCK_SIZE 4096 257 - #define DM_ERA_METADATA_CACHE_SIZE 64 258 257 #define ERA_MAX_CONCURRENT_LOCKS 5 259 258 260 259 struct era_metadata { ··· 614 615 int r; 615 616 616 617 md->bm = dm_block_manager_create(md->bdev, DM_ERA_METADATA_BLOCK_SIZE, 617 - DM_ERA_METADATA_CACHE_SIZE, 618 618 ERA_MAX_CONCURRENT_LOCKS); 619 619 if (IS_ERR(md->bm)) { 620 620 DMERR("could not create block manager");

-2

drivers/md/dm-thin-metadata.c

··· 77 77 #define THIN_SUPERBLOCK_MAGIC 27022010 78 78 #define THIN_SUPERBLOCK_LOCATION 0 79 79 #define THIN_VERSION 2 80 - #define THIN_METADATA_CACHE_SIZE 64 81 80 #define SECTOR_TO_BLOCK_SHIFT 3 82 81 83 82 /* ··· 685 686 int r; 686 687 687 688 pmd->bm = dm_block_manager_create(pmd->bdev, THIN_METADATA_BLOCK_SIZE << SECTOR_SHIFT, 688 - THIN_METADATA_CACHE_SIZE, 689 689 THIN_MAX_CONCURRENT_LOCKS); 690 690 if (IS_ERR(pmd->bm)) { 691 691 DMERR("could not create block manager");

-1

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

··· 378 378 379 379 struct dm_block_manager *dm_block_manager_create(struct block_device *bdev, 380 380 unsigned block_size, 381 - unsigned cache_size, 382 381 unsigned max_held_per_thread) 383 382 { 384 383 int r;

+1 -1

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

··· 33 33 struct dm_block_manager; 34 34 struct dm_block_manager *dm_block_manager_create( 35 35 struct block_device *bdev, unsigned block_size, 36 - unsigned cache_size, unsigned max_held_per_thread); 36 + unsigned max_held_per_thread); 37 37 void dm_block_manager_destroy(struct dm_block_manager *bm); 38 38 39 39 unsigned dm_bm_block_size(struct dm_block_manager *bm);