From e8c6882cc9c28b07ae1d5dc1169920c3ee821ed5 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 12 Dec 2017 19:58:01 -0800 Subject: [PATCH] memstore: write fsid to fsid not fs_fsid Fixes: http://tracker.ceph.com/issues/20736 Signed-off-by: Patrick Donnelly --- src/os/memstore/MemStore.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/os/memstore/MemStore.cc b/src/os/memstore/MemStore.cc index cc3425c14c1c..f227e9540319 100644 --- a/src/os/memstore/MemStore.cc +++ b/src/os/memstore/MemStore.cc @@ -172,14 +172,14 @@ int MemStore::_load() void MemStore::set_fsid(uuid_d u) { - int r = write_meta("fs_fsid", stringify(u)); + int r = write_meta("fsid", stringify(u)); assert(r >= 0); } uuid_d MemStore::get_fsid() { string fsid_str; - int r = read_meta("fs_fsid", &fsid_str); + int r = read_meta("fsid", &fsid_str); assert(r >= 0); uuid_d uuid; bool b = uuid.parse(fsid_str.c_str()); @@ -190,12 +190,12 @@ uuid_d MemStore::get_fsid() int MemStore::mkfs() { string fsid_str; - int r = read_meta("fs_fsid", &fsid_str); + int r = read_meta("fsid", &fsid_str); if (r == -ENOENT) { uuid_d fsid; fsid.generate_random(); fsid_str = stringify(fsid); - r = write_meta("fs_fsid", fsid_str); + r = write_meta("fsid", fsid_str); if (r < 0) return r; dout(1) << __func__ << " new fsid " << fsid_str << dendl; -- 2.47.3