From: Sage Weil <sage@redhat.com>
Date: Wed, 28 Dec 2016 17:56:55 +0000 (-0600)
Subject: Merge pull request #12703 from kylinstorage/wip-remove-unused-variable
X-Git-Tag: v12.0.0~347
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1611090173a1a84b073e69487b3c9b02d31bc260;p=ceph.git

Merge pull request #12703 from kylinstorage/wip-remove-unused-variable

os/bluestore/BlueStore.cc: remove unused variable

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
---

1611090173a1a84b073e69487b3c9b02d31bc260
diff --cc src/os/bluestore/BlueStore.cc
index e8ff586e6c53,76d9228882c0..ba448cf35784
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@@ -3440,9 -3326,8 +3440,8 @@@ int BlueStore::_open_db(bool create
        derr << __func__ << " failed bluefs mount: " << cpp_strerror(r) << dendl;
        goto free_bluefs;
      }
 -    if (g_conf->bluestore_bluefs_env_mirror) {
 +    if (cct->_conf->bluestore_bluefs_env_mirror) {
        rocksdb::Env *a = new BlueRocksEnv(bluefs);
-       unique_ptr<rocksdb::Directory> dir;
        rocksdb::Env *b = rocksdb::Env::Default();
        if (create) {
  	string cmd = "rm -rf " + path + "/db " +