From: Sage Weil <sage@redhat.com>
Date: Tue, 2 Feb 2016 13:08:26 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh/wip-da-SCA-20150910'
X-Git-Tag: v10.0.4~86
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aa5e8db78b0164ce4074ba67fb64ccad580ce473;p=ceph.git

Merge remote-tracking branch 'gh/wip-da-SCA-20150910'

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

aa5e8db78b0164ce4074ba67fb64ccad580ce473
diff --cc src/os/bluestore/BlueStore.cc
index 6f6ecd4fbf33,1fb4b67e2a2f..30496e7afbbd
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@@ -751,6 -757,8 +751,7 @@@ BlueStore::BlueStore(CephContext *cct, 
      fsid_fd(-1),
      mounted(false),
      coll_lock("BlueStore::coll_lock"),
 -    nid_lock("BlueStore::nid_lock"),
+     nid_last(0),
      nid_max(0),
      throttle_ops(cct, "bluestore_max_ops", cct->_conf->bluestore_max_ops),
      throttle_bytes(cct, "bluestore_max_bytes", cct->_conf->bluestore_max_bytes),
diff --cc src/os/filestore/CollectionIndex.h
index 63744cbd08de,7e2fc55ce8f1..3c27fecad208
--- a/src/os/filestore/CollectionIndex.h
+++ b/src/os/filestore/CollectionIndex.h
@@@ -176,7 -176,7 +176,7 @@@ protected
    /// Call prior to removing directory
    virtual int prep_delete() { return 0; }
  
-   CollectionIndex(const coll_t& collection):
 -  explicit CollectionIndex(coll_t collection):
++  explicit CollectionIndex(const coll_t& collection):
      access_lock_name ("CollectionIndex::access_lock::" + collection.to_str()),
      access_lock(access_lock_name.c_str()) {}