diff options
author | Joe Thornber <ejt@redhat.com> | 2015-08-12 15:10:21 +0100 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2015-09-16 10:00:04 -0400 |
commit | c03b0a447fcb80f7698c05d3dec1aae378f45f52 (patch) | |
tree | e3a0eba0f8fcb0e3df121793990fa7d1d11bdfaa | |
parent | 03152d7cff8f0083bac4a260df2c75c124af9399 (diff) |
dm thin metadata: delete btrees when releasing metadata snapshot
[ Upstream commit 7f518ad0a212e2a6fd68630e176af1de395070a7 ]
The device details and mapping trees were just being decremented
before. Now btree_del() is called to do a deep delete.
Signed-off-by: Joe Thornber <ejt@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
-rw-r--r-- | drivers/md/dm-thin-metadata.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c index e9d33ad59df5..3412b86e79fd 100644 --- a/drivers/md/dm-thin-metadata.c +++ b/drivers/md/dm-thin-metadata.c @@ -1295,8 +1295,8 @@ static int __release_metadata_snap(struct dm_pool_metadata *pmd) return r; disk_super = dm_block_data(copy); - dm_sm_dec_block(pmd->metadata_sm, le64_to_cpu(disk_super->data_mapping_root)); - dm_sm_dec_block(pmd->metadata_sm, le64_to_cpu(disk_super->device_details_root)); + dm_btree_del(&pmd->info, le64_to_cpu(disk_super->data_mapping_root)); + dm_btree_del(&pmd->details_info, le64_to_cpu(disk_super->device_details_root)); dm_sm_dec_block(pmd->metadata_sm, held_root); return dm_tm_unlock(pmd->tm, copy); |