diff options
author | Joe Thornber <ejt@redhat.com> | 2015-12-09 16:23:24 +0000 |
---|---|---|
committer | Mike Snitzer <snitzer@redhat.com> | 2015-12-09 13:18:12 -0500 |
commit | 49e99fc717f624aa75ca755d6e7bc029efd3f0e9 (patch) | |
tree | d4bf6148e45a044eaf8cba9c5e827efff06a7f1b | |
parent | 993ceab91986e2e737ce9a3e23bebc8cce649240 (diff) | |
download | linux-stable-49e99fc717f624aa75ca755d6e7bc029efd3f0e9.tar.gz linux-stable-49e99fc717f624aa75ca755d6e7bc029efd3f0e9.tar.bz2 linux-stable-49e99fc717f624aa75ca755d6e7bc029efd3f0e9.zip |
dm thin metadata: fix bug when taking a metadata snapshot
When you take a metadata snapshot the btree roots for the mapping and
details tree need to have their reference counts incremented so they
persist for the lifetime of the metadata snap.
The roots being incremented were those currently written in the
superblock, which could possibly be out of date if concurrent IO is
triggering new mappings, breaking of sharing, etc.
Fix this by performing a commit with the metadata lock held while taking
a metadata snapshot.
Signed-off-by: Joe Thornber <ejt@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Cc: stable@vger.kernel.org
-rw-r--r-- | drivers/md/dm-thin-metadata.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c index 67871e74c82b..c219a053c7f6 100644 --- a/drivers/md/dm-thin-metadata.c +++ b/drivers/md/dm-thin-metadata.c @@ -1207,6 +1207,12 @@ static int __reserve_metadata_snap(struct dm_pool_metadata *pmd) dm_block_t held_root; /* + * We commit to ensure the btree roots which we increment in a + * moment are up to date. + */ + __commit_transaction(pmd); + + /* * Copy the superblock. */ dm_sm_inc_block(pmd->metadata_sm, THIN_SUPERBLOCK_LOCATION); |