]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSD: OSD::mkfs asserts when reusing disk with existing superblock. 25308/head
authorIgor Fedotov <ifedotov@suse.com>
Tue, 27 Nov 2018 11:39:09 +0000 (14:39 +0300)
committerIgor Fedotov <ifedotov@suse.com>
Thu, 29 Nov 2018 09:48:23 +0000 (12:48 +0300)
Fixes: http://tracker.ceph.com/issues/37404
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
src/osd/OSD.cc

index 9b3a7a36104066f16766c0a729f1ef1cb6cee58b..18c183222ee36633453395f09018e917965828af 100644 (file)
@@ -1935,6 +1935,9 @@ int OSD::mkfs(CephContext *cct, ObjectStore *store, uuid_d fsid, int whoami)
   }
 
 umount_store:
+  if (ch) {
+    ch.reset();
+  }
   store->umount();
 free_store:
   delete store;