From: Igor Fedotov <ifedotov@suse.com>
Date: Tue, 27 Nov 2018 11:39:09 +0000 (+0300)
Subject: osd/OSD: OSD::mkfs asserts when reusing disk with existing superblock.
X-Git-Tag: v13.2.5~50^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F25385%2Fhead;p=ceph.git

osd/OSD: OSD::mkfs asserts when reusing disk with existing superblock.

Fixes: http://tracker.ceph.com/issues/37404

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 328ab2d9f0a27aa38d153469f8ed11e21a6c3ae8)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 182f0e4314cc..5c98dc0ac248 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -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;