]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSD: OSD::mkfs asserts when reusing disk with existing superblock. 25385/head
authorIgor Fedotov <ifedotov@suse.com>
Tue, 27 Nov 2018 11:39:09 +0000 (14:39 +0300)
committerIgor Fedotov <ifedotov@suse.com>
Tue, 29 Jan 2019 09:59:23 +0000 (12:59 +0300)
Fixes: http://tracker.ceph.com/issues/37404
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 328ab2d9f0a27aa38d153469f8ed11e21a6c3ae8)

src/osd/OSD.cc

index 182f0e4314cc4819e96849d9850e52811768374b..5c98dc0ac24847cf04ba423b2b3ff012708b3680 100644 (file)
@@ -1750,6 +1750,9 @@ int OSD::mkfs(CephContext *cct, ObjectStore *store, const string &dev,
   }
 
 umount_store:
+  if (ch) {
+    ch.reset();
+  }
   store->umount();
 free_store:
   delete store;