]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #12703 from kylinstorage/wip-remove-unused-variable
authorSage Weil <sage@redhat.com>
Wed, 28 Dec 2016 17:56:55 +0000 (11:56 -0600)
committerGitHub <noreply@github.com>
Wed, 28 Dec 2016 17:56:55 +0000 (11:56 -0600)
os/bluestore/BlueStore.cc: remove unused variable

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
1  2 
src/os/bluestore/BlueStore.cc

index e8ff586e6c5336bd3aabd47623703f2355501805,76d9228882c019a04617cdea92aa46f0a2b41f09..ba448cf35784759835e777318997dbd96f815325
@@@ -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 " +