dm thin metadata: lift some initialisation out of __open_or_format_metadata

Lift some initialisation out of __open_or_format_metadata in dm-thin-metadata.

Signed-off-by: Joe Thornber <ejt@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
Joe Thornber 2012-07-27 15:08:10 +01:00 коммит произвёл Alasdair G Kergon
Родитель f9dd9352b9
Коммит 6a0ebd31b6
1 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -489,14 +489,11 @@ static int __open_or_format_metadata(struct dm_pool_metadata *pmd,
} }
__setup_btree_details(pmd); __setup_btree_details(pmd);
pmd->root = 0;
init_rwsem(&pmd->root_lock); pmd->root = 0;
pmd->time = 0;
pmd->details_root = 0; pmd->details_root = 0;
pmd->trans_id = 0; pmd->trans_id = 0;
pmd->flags = 0; pmd->flags = 0;
INIT_LIST_HEAD(&pmd->thin_devices);
return 0; return 0;
@ -710,6 +707,9 @@ struct dm_pool_metadata *dm_pool_metadata_open(struct block_device *bdev,
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
init_rwsem(&pmd->root_lock);
pmd->time = 0;
INIT_LIST_HEAD(&pmd->thin_devices);
pmd->bdev = bdev; pmd->bdev = bdev;
r = __create_persistent_data_objects(pmd, 0, &create); r = __create_persistent_data_objects(pmd, 0, &create);