From a97e5e6fd027840fc28c72470c581ba68ee9732a Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Fri, 27 Jul 2012 15:08:12 +0100 Subject: [PATCH] dm thin metadata: remove nr_blocks arg from __create_persistent_data_objects Remove nr_blocks arg from __create_persistent_data_objects in dm-thin-metadata. It was always passed as zero. Signed-off-by: Joe Thornber Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon --- drivers/md/dm-thin-metadata.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c index 31d21bfc8cb4..83ce2fde8ed7 100644 --- a/drivers/md/dm-thin-metadata.c +++ b/drivers/md/dm-thin-metadata.c @@ -485,7 +485,7 @@ bad_locked: return r; } -static int __format_metadata(struct dm_pool_metadata *pmd, dm_block_t nr_blocks) +static int __format_metadata(struct dm_pool_metadata *pmd) { int r; @@ -496,7 +496,7 @@ static int __format_metadata(struct dm_pool_metadata *pmd, dm_block_t nr_blocks) return r; } - pmd->data_sm = dm_sm_disk_create(pmd->tm, nr_blocks); + pmd->data_sm = dm_sm_disk_create(pmd->tm, 0); if (IS_ERR(pmd->data_sm)) { DMERR("sm_disk_create failed"); r = PTR_ERR(pmd->data_sm); @@ -596,16 +596,16 @@ bad: } static int __open_or_format_metadata(struct dm_pool_metadata *pmd, - dm_block_t nr_blocks, int create) + int create) { if (create) - return __format_metadata(pmd, nr_blocks); + return __format_metadata(pmd); else return __open_metadata(pmd); } static int __create_persistent_data_objects(struct dm_pool_metadata *pmd, - dm_block_t nr_blocks, int *create) + int *create) { int r; @@ -623,7 +623,7 @@ static int __create_persistent_data_objects(struct dm_pool_metadata *pmd, return r; } - r = __open_or_format_metadata(pmd, nr_blocks, *create); + r = __open_or_format_metadata(pmd, *create); if (r) dm_block_manager_destroy(pmd->bm); @@ -808,7 +808,7 @@ struct dm_pool_metadata *dm_pool_metadata_open(struct block_device *bdev, pmd->bdev = bdev; pmd->data_block_size = data_block_size; - r = __create_persistent_data_objects(pmd, 0, &create); + r = __create_persistent_data_objects(pmd, &create); if (r) { kfree(pmd); return ERR_PTR(r); -- 2.39.5