Changeset View
Changeset View
Standalone View
Standalone View
head/net/ceph/files/patch-src_tools_ceph__kvstore__tool.cc
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| --- src/tools/ceph_kvstore_tool.cc.orig 2017-11-30 14:59:27 UTC | |||||
| +++ src/tools/ceph_kvstore_tool.cc | |||||
| @@ -36,11 +36,13 @@ using namespace std; | |||||
| class StoreTool | |||||
| { | |||||
| +#ifdef HAVE_LIBAIO | |||||
| boost::scoped_ptr<BlueStore> bluestore; | |||||
| +#endif | |||||
| // TODO: make KeyValueDB enable_shared_from_this | |||||
| // bluestore will hold *db* also, use unique_ptr/shared_ptr will | |||||
| // double free. | |||||
| KeyValueDB* db; | |||||
| string store_path; | |||||
| @@ -74,10 +76,13 @@ class StoreTool | |||||
| } | |||||
| ~StoreTool() { | |||||
| +#ifdef HAVE_LIBAIO | |||||
| if (bluestore) { | |||||
| bluestore->umount(); | |||||
| } | |||||
| - else { | |||||
| + else | |||||
| +#endif | |||||
| + { | |||||
| if (db) { | |||||
| delete db; | |||||
| } | |||||