RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 17:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

librbd: always deregister child clone from parent with deep flatten

Browse Source 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2015-04-20 13:38:10 -04:00
parent 12719478ad
commit bc66b7849a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librbd/AsyncFlattenRequest.cc
View File

@ -166,7 +166,8 @@ bool AsyncFlattenRequest::send_update_children() {
// (if snapshots remain, they have their own parent info, and the child
// will be removed when the last snap goes away)
RWLock::RLocker l2(m_image_ctx.snap_lock);
if (!m_image_ctx.snaps.empty()) {
if ((m_image_ctx.features & RBD_FEATURE_DEEP_FLATTEN) == 0 &&
!m_image_ctx.snaps.empty()) {
return true;
}
@ -180,7 +181,7 @@ bool AsyncFlattenRequest::send_update_children() {
assert(r == 0);
rados_completion->release();
}
}
}
if (lost_exclusive_lock) {
complete(-ERESTART);