提交 a97e5e6f 编写于 作者: J Joe Thornber 提交者: Alasdair G Kergon

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: NJoe Thornber <ejt@redhat.com>
Signed-off-by: NMike Snitzer <snitzer@redhat.com>
Signed-off-by: NAlasdair G Kergon <agk@redhat.com>
上级 e4d2205c
...@@ -485,7 +485,7 @@ static int __write_initial_superblock(struct dm_pool_metadata *pmd) ...@@ -485,7 +485,7 @@ static int __write_initial_superblock(struct dm_pool_metadata *pmd)
return r; 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; int r;
...@@ -496,7 +496,7 @@ static int __format_metadata(struct dm_pool_metadata *pmd, dm_block_t nr_blocks) ...@@ -496,7 +496,7 @@ static int __format_metadata(struct dm_pool_metadata *pmd, dm_block_t nr_blocks)
return r; 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)) { if (IS_ERR(pmd->data_sm)) {
DMERR("sm_disk_create failed"); DMERR("sm_disk_create failed");
r = PTR_ERR(pmd->data_sm); r = PTR_ERR(pmd->data_sm);
...@@ -596,16 +596,16 @@ static int __open_metadata(struct dm_pool_metadata *pmd) ...@@ -596,16 +596,16 @@ static int __open_metadata(struct dm_pool_metadata *pmd)
} }
static int __open_or_format_metadata(struct dm_pool_metadata *pmd, static int __open_or_format_metadata(struct dm_pool_metadata *pmd,
dm_block_t nr_blocks, int create) int create)
{ {
if (create) if (create)
return __format_metadata(pmd, nr_blocks); return __format_metadata(pmd);
else else
return __open_metadata(pmd); return __open_metadata(pmd);
} }
static int __create_persistent_data_objects(struct dm_pool_metadata *pmd, static int __create_persistent_data_objects(struct dm_pool_metadata *pmd,
dm_block_t nr_blocks, int *create) int *create)
{ {
int r; int r;
...@@ -623,7 +623,7 @@ static int __create_persistent_data_objects(struct dm_pool_metadata *pmd, ...@@ -623,7 +623,7 @@ static int __create_persistent_data_objects(struct dm_pool_metadata *pmd,
return r; return r;
} }
r = __open_or_format_metadata(pmd, nr_blocks, *create); r = __open_or_format_metadata(pmd, *create);
if (r) if (r)
dm_block_manager_destroy(pmd->bm); dm_block_manager_destroy(pmd->bm);
...@@ -808,7 +808,7 @@ struct dm_pool_metadata *dm_pool_metadata_open(struct block_device *bdev, ...@@ -808,7 +808,7 @@ struct dm_pool_metadata *dm_pool_metadata_open(struct block_device *bdev,
pmd->bdev = bdev; pmd->bdev = bdev;
pmd->data_block_size = data_block_size; pmd->data_block_size = data_block_size;
r = __create_persistent_data_objects(pmd, 0, &create); r = __create_persistent_data_objects(pmd, &create);
if (r) { if (r) {
kfree(pmd); kfree(pmd);
return ERR_PTR(r); return ERR_PTR(r);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册