diff options
| author | Patrick Donnelly <pdonnell@redhat.com> | 2017-12-14 00:30:13 +0100 |
|---|---|---|
| committer | Patrick Donnelly <pdonnell@redhat.com> | 2017-12-14 00:30:34 +0100 |
| commit | 255453442fcc28e79f60bafafee06a4b0f79cffc (patch) | |
| tree | 7b3b078e2b0f172ab6f6c9f6b2e5599e8e316fd3 | |
| parent | qa/suites/rados: add missing openstack volumes (diff) | |
| parent | memstore: write fsid to fsid not fs_fsid (diff) | |
| download | ceph-255453442fcc28e79f60bafafee06a4b0f79cffc.tar.xz ceph-255453442fcc28e79f60bafafee06a4b0f79cffc.zip | |
Merge PR #19462 into mimic-dev1
* refs/pull/19462/head:
memstore: write fsid to fsid not fs_fsid
Reviewed-by: Sage Weil <sage@redhat.com>
| -rw-r--r-- | src/os/memstore/MemStore.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/os/memstore/MemStore.cc b/src/os/memstore/MemStore.cc index cc3425c14c1..f227e954031 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; |