From ab072412c84257b2d90091954045ce6d55104b04 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 20 Nov 2008 14:00:33 -0800 Subject: [PATCH] osd: fix peek_whoami --- src/osd/OSD.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 2f13e8924a85b..0bb7f8d884775 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -221,13 +221,14 @@ int OSD::peek_whoami(ceph_fsid& fsid, const char *dev) OSDSuperblock sb; bufferlist bl; err = store->read(0, OSD_SUPERBLOCK_POBJECT, 0, sizeof(sb), bl); + store->umount(); + delete store; + if (err < 0) return -ENOENT; - delete store; bufferlist::iterator p = bl.begin(); ::decode(sb, p); - store->umount(); if (!ceph_fsid_equal(&sb.fsid, &fsid)) { generic_dout(0) << "dev fsid " << sb.fsid << " != monmap fsid " << fsid << dendl; -- 2.39.5